From 8d78806299b1ec96d6da2461cd036b4297182240 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Fri, 18 Jul 2014 15:03:25 -0700 Subject: Fix travis --- Makefile.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 951bd51..3777000 100644 --- a/Makefile.in +++ b/Makefile.in @@ -342,7 +342,10 @@ ii: ${PREPROCESSED} ll: ${IRS} bc: ${BITCODES} s: ${ASSEMBLED} -o: ${OBJECTS} +o: ${PDC_OBJECTS} +# why not PIC objects? Because this is only for debugging, so we don't need +# duplicates, and PDC is more common, and also some override rules are only +# currently defined for PDC clean-deps: -$l find obj -name '*.d' -delete @@ -412,7 +415,7 @@ lib/%.${SO_LONG}: lib/%.${SO_LONG}-gdb.py ${TEST_BINARIES}: obj/gtest-all.pdc.o # This isn't perfect. -$(filter %_test.pdc.o,${OBJECTS}) obj/gtest-all.pdc.o: override CPPFLAGS += -DGTEST_HAS_PTHREAD=0 -I${GTEST_DIR} +$(filter %_test.pdc.o,${PDC_OBJECTS}) obj/gtest-all.pdc.o: override CPPFLAGS += -DGTEST_HAS_PTHREAD=0 -I${GTEST_DIR} obj/gtest-all.pdc.o: override WARNINGS := obj/gtest-all.pdc.o: ${GTEST_DIR}/src/gtest-all.cc $(MKDIR_FIRST) -- cgit v1.2.3-60-g2f50