diff options
| author | Gavin Andresen <[email protected]> | 2012-07-04 10:46:44 -0400 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2012-07-04 10:46:44 -0400 |
| commit | 8a05341cf5543eec18f3a1380a0098dbd314e351 (patch) | |
| tree | 2a6b699ab247fb8bd913ca0fbc6e01e8a297ee4a /src | |
| parent | Merge pull request #1512 from jgarzik/json-batch (diff) | |
| parent | Work around a distcc bug where -MMD output isn't copied. (diff) | |
| download | discoin-8a05341cf5543eec18f3a1380a0098dbd314e351.tar.xz discoin-8a05341cf5543eec18f3a1380a0098dbd314e351.zip | |
Merge branch 'buildupdates' of https://github.com/TheBlueMatt/bitcoin
Diffstat (limited to 'src')
| -rw-r--r-- | src/makefile.osx | 4 | ||||
| -rw-r--r-- | src/makefile.unix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/makefile.osx b/src/makefile.osx index cbb269cef..44e648d67 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 420c7ac3f..6d9bf276d 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); \ |