diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-07-18 15:03:25 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-07-18 15:03:25 -0700 |
| commit | 8d78806299b1ec96d6da2461cd036b4297182240 (patch) | |
| tree | 74c80a17c9c01e5896a96d73c6c044dac407c196 /Makefile.in | |
| parent | 25070b355b8a0394c1fbd9cf82c44752b5a8b8c3 (diff) | |
| download | tmwa-8d78806299b1ec96d6da2461cd036b4297182240.tar.gz tmwa-8d78806299b1ec96d6da2461cd036b4297182240.tar.bz2 tmwa-8d78806299b1ec96d6da2461cd036b4297182240.tar.xz tmwa-8d78806299b1ec96d6da2461cd036b4297182240.zip | |
Fix travis
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 7 |
1 files changed, 5 insertions, 2 deletions
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) |