neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Use linker-arguments only when linking

Browse Source 
Passing linker-arguments when only compiling will cause warnings with
Clang. This change fixes those.

Signed-off-by: Giel van Schijndel <me@mortis.eu>
This commit is contained in:
Giel van Schijndel 2012-06-24 14:02:14 +02:00
parent 1c009d622d
commit f04f24503d
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/makefile.unix
View File

@ -66,13 +66,14 @@ LIBS+= \
# Make some important things such as the global offset table read only as soon as # 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 # the dynamic linker is finished building it. This will prevent overwriting of addresses
# which would later be jumped to. # 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 # Build position independent code to take advantage of Address Space Layout Randomization
# offered by some kernels. # offered by some kernels.
# see doc/build-unix.txt for more information. # see doc/build-unix.txt for more information.
ifdef PIE ifdef PIE
HARDENING+=-fPIE -pie HARDENING+=-fPIE
LDHARDENING+=-pie
endif endif
# -D_FORTIFY_SOURCE=2 does some checking for potentially exploitable code patterns in # -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 \ xCXXFLAGS=-O2 -pthread -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter \
$(DEBUGFLAGS) $(DEFS) $(HARDENING) $(CXXFLAGS) $(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= \ OBJS= \
obj/version.o \ obj/version.o \
obj/checkpoints.o \ obj/checkpoints.o \
@ -133,7 +138,7 @@ obj/%.o: %.cpp
rm -f $(@:%.o=%.d) rm -f $(@:%.o=%.d)
bitcoind: $(OBJS:obj/%=obj/%) bitcoind: $(OBJS:obj/%=obj/%)
$(CXX) $(xCXXFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) $(CXX) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS)
TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp)) TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp))
@ -145,7 +150,7 @@ obj-test/%.o: test/%.cpp
rm -f $(@:%.o=%.d) rm -f $(@:%.o=%.d)
test_bitcoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%)) 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: clean:
-rm -f bitcoind test_bitcoin -rm -f bitcoind test_bitcoin