aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Corallo <matt@bluematt.me>2012-07-03 17:30:43 +0200
committerMatt Corallo <matt@bluematt.me>2012-07-03 17:50:35 +0200
commit4d9c55da72e2bcf40f79a9d818dcef04e8308b35 (patch)
treea358bb48c256284cccd03f0b6f135c343752579a
parentda1103f4f8288cffc9ea475254fdeb258f04de77 (diff)
Work around a distcc bug where -MMD output isn't copied.
-rw-r--r--src/makefile.osx4
-rw-r--r--src/makefile.unix4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/makefile.osx b/src/makefile.osx
index cbb269cef1..44e648d677 100644
--- a/src/makefile.osx
+++ b/src/makefile.osx
@@ -113,7 +113,7 @@ version.cpp: obj/build.h
DEFS += -DHAVE_BUILD_INFO
obj/%.o: %.cpp
- $(CXX) -c $(CFLAGS) -MMD -o $@ $<
+ $(CXX) -c $(CFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
@cp $(@:%.o=%.d) $(@:%.o=%.P); \
sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
@@ -125,7 +125,7 @@ bitcoind: $(OBJS:obj/%=obj/%)
TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
obj-test/%.o: test/%.cpp
- $(CXX) -c $(TESTDEFS) $(CFLAGS) -MMD -o $@ $<
+ $(CXX) -c $(TESTDEFS) $(CFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
@cp $(@:%.o=%.d) $(@:%.o=%.P); \
sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
diff --git a/src/makefile.unix b/src/makefile.unix
index 420c7ac3fa..6d9bf276df 100644
--- a/src/makefile.unix
+++ b/src/makefile.unix
@@ -125,7 +125,7 @@ version.cpp: obj/build.h
DEFS += -DHAVE_BUILD_INFO
obj/%.o: %.cpp
- $(CXX) -c $(xCXXFLAGS) -MMD -o $@ $<
+ $(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
@cp $(@:%.o=%.d) $(@:%.o=%.P); \
sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \
@@ -137,7 +137,7 @@ bitcoind: $(OBJS:obj/%=obj/%)
TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
obj-test/%.o: test/%.cpp
- $(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -MMD -o $@ $<
+ $(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $<
@cp $(@:%.o=%.d) $(@:%.o=%.P); \
sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \