tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS."

Browse source
This commit is contained in:
Torne (Richard Coles) 2014-02-26 11:04:03 +00:00 committed by Gerrit Code Review
commit 630020883a
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/definitions.mk
View file

@ -1240,11 +1240,11 @@ $(hide) $(PRIVATE_CXX) \
-Wl,-rpath-link=$(HOST_OUT_INTERMEDIATE_LIBRARIES) \ -Wl,-rpath-link=$(HOST_OUT_INTERMEDIATE_LIBRARIES) \
-Wl,-rpath,\$$ORIGIN/../lib \ -Wl,-rpath,\$$ORIGIN/../lib \
-shared -Wl,-soname,$(notdir $@) \ -shared -Wl,-soname,$(notdir $@) \
$(PRIVATE_LDFLAGS) \
$(HOST_GLOBAL_LD_DIRS) \ $(HOST_GLOBAL_LD_DIRS) \
$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \
$(PRIVATE_HOST_GLOBAL_LDFLAGS) \ $(PRIVATE_HOST_GLOBAL_LDFLAGS) \
) \ ) \
$(PRIVATE_LDFLAGS) \
$(PRIVATE_ALL_OBJECTS) \ $(PRIVATE_ALL_OBJECTS) \
-Wl,--whole-archive \ -Wl,--whole-archive \
$(call normalize-host-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \ $(call normalize-host-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \
@ -1395,11 +1395,11 @@ $(hide) $(PRIVATE_CXX) \
-Wl,-rpath-link=$(HOST_OUT_INTERMEDIATE_LIBRARIES) \ -Wl,-rpath-link=$(HOST_OUT_INTERMEDIATE_LIBRARIES) \
-Wl,-rpath,\$$ORIGIN/../lib \ -Wl,-rpath,\$$ORIGIN/../lib \
$(HOST_GLOBAL_LD_DIRS) \ $(HOST_GLOBAL_LD_DIRS) \
$(PRIVATE_LDFLAGS) \
$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \
$(PRIVATE_HOST_GLOBAL_LDFLAGS) \ $(PRIVATE_HOST_GLOBAL_LDFLAGS) \
-fPIE -pie \ -fPIE -pie \
) \ ) \
$(PRIVATE_LDFLAGS) \
-o $@ \ -o $@ \
$(PRIVATE_LDLIBS) $(PRIVATE_LDLIBS)
endef endef