diff options
| author | Conley Owens <cco3@android.com> | 2011-11-10 19:01:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-10 19:01:36 +0000 |
| commit | e04c2c21ee40f7e54924c586d5e7c148e0955ee1 (patch) | |
| tree | 987b6c6f6e361844e9d27553396cf9635c87fefb | |
| parent | 53bef54cfff0cb9c6a67494b3e385a9617f75d03 (diff) | |
| parent | e915ab45a11f88c4fa5f2561c1aaca4b7d3d7593 (diff) | |
| download | build-e04c2c21ee40f7e54924c586d5e7c148e0955ee1.zip build-e04c2c21ee40f7e54924c586d5e7c148e0955ee1.tar.gz build-e04c2c21ee40f7e54924c586d5e7c148e0955ee1.tar.bz2 | |
am e915ab45: Place linker arguments after objects for gcc
* commit 'e915ab45a11f88c4fa5f2561c1aaca4b7d3d7593':
Place linker arguments after objects for gcc
| -rw-r--r-- | core/definitions.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/definitions.mk b/core/definitions.mk index 683ae16..5410b11 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -1292,13 +1292,6 @@ endef ifneq ($(HOST_CUSTOM_LD_COMMAND),true) define transform-host-o-to-executable-inner $(hide) $(PRIVATE_CXX) \ - -Wl,-rpath-link=$(HOST_OUT_INTERMEDIATE_LIBRARIES) \ - -Wl,-rpath,\$$ORIGIN/../lib \ - $(HOST_GLOBAL_LD_DIRS) \ - $(PRIVATE_LDFLAGS) \ - $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ - $(HOST_GLOBAL_LDFLAGS) \ - ) \ $(PRIVATE_ALL_OBJECTS) \ -Wl,--whole-archive \ $(call normalize-host-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \ @@ -1307,6 +1300,13 @@ $(hide) $(PRIVATE_CXX) \ $(call normalize-host-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \ $(if $(PRIVATE_GROUP_STATIC_LIBRARIES),-Wl$(comma)--end-group) \ $(call normalize-host-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \ + -Wl,-rpath-link=$(HOST_OUT_INTERMEDIATE_LIBRARIES) \ + -Wl,-rpath,\$$ORIGIN/../lib \ + $(HOST_GLOBAL_LD_DIRS) \ + $(PRIVATE_LDFLAGS) \ + $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ + $(HOST_GLOBAL_LDFLAGS) \ + ) \ -o $@ \ $(PRIVATE_LDLIBS) endef |