diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2012-07-16 21:23:57 -0400 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2012-07-16 21:23:57 -0400 |
| commit | 14ad993895a527a4b42aef8b5c2ee0626b230ab2 (patch) | |
| tree | 52fc0d74d1121e25d203dec3ec64810321f5a4c4 /src | |
| parent | 92f6fb4cfa8ac18023072a6e76f51b9f1a249f96 (diff) | |
| parent | f04f24503d7ea9b943d0a940465618b93ff4577d (diff) | |
| download | bitcoin-14ad993895a527a4b42aef8b5c2ee0626b230ab2.tar.xz | |
Merge branch 'fix-commandline-warnings' of git://github.com/muggenhor/bitcoin
Diffstat (limited to 'src')
| -rw-r--r-- | src/makefile.unix | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/makefile.unix b/src/makefile.unix index 2784335a20..a81300329e 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -66,13 +66,14 @@ LIBS+= \ # Make some important things such as the global offset table read only as soon as # the dynamic linker is finished building it. This will prevent overwriting of addresses # which would later be jumped to. - HARDENING+=-Wl,-z,relro -Wl,-z,now + LDHARDENING+=-Wl,-z,relro -Wl,-z,now # Build position independent code to take advantage of Address Space Layout Randomization # offered by some kernels. # see doc/build-unix.txt for more information. ifdef PIE - HARDENING+=-fPIE -pie + HARDENING+=-fPIE + LDHARDENING+=-pie endif # -D_FORTIFY_SOURCE=2 does some checking for potentially exploitable code patterns in @@ -88,6 +89,10 @@ DEBUGFLAGS=-g xCXXFLAGS=-O2 -pthread -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter \ $(DEBUGFLAGS) $(DEFS) $(HARDENING) $(CXXFLAGS) +# LDFLAGS can be specified on the make command line, so we use xLDFLAGS that only +# adds some defaults in front. Unfortunately, LDFLAGS=... $(LDFLAGS) does not work. +xLDFLAGS=$(LDHARDENING) $(LDFLAGS) + OBJS= \ obj/version.o \ obj/checkpoints.o \ @@ -133,7 +138,7 @@ obj/%.o: %.cpp rm -f $(@:%.o=%.d) bitcoind: $(OBJS:obj/%=obj/%) - $(CXX) $(xCXXFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) + $(CXX) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS) TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp)) @@ -145,7 +150,7 @@ obj-test/%.o: test/%.cpp rm -f $(@:%.o=%.d) test_bitcoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%)) - $(CXX) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ -Wl,-B$(LMODE) -lboost_unit_test_framework $(LDFLAGS) $(LIBS) + $(CXX) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ -Wl,-B$(LMODE) -lboost_unit_test_framework $(xLDFLAGS) $(LIBS) clean: -rm -f bitcoind test_bitcoin |