Allow LOCAL_LDFLAGS to override HOST_GLOBAL_LDFLAGS.

For host executables and shared libraries, the global LDFLAGS were being
inserted into the linker command line after the module-specific ones,
making it impossible to override the default settings. Change the order
to match target linker invocations.

Change-Id: Icd5f6f83df9f27a5be97ddb197ee245c1ab8c2be

diff --git a/core/definitions.mk b/core/definitions.mk
index 13acb58..f0973df 100644 (file)
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1255,11 +1255,11 @@ $(hide) $(PRIVATE_CXX) \
        -Wl,-rpath-link=$(HOST_OUT_INTERMEDIATE_LIBRARIES) \
        -Wl,-rpath,\$$ORIGIN/../lib \
        -shared -Wl,-soname,$(notdir $@) \
-       $(PRIVATE_LDFLAGS) \
        $(HOST_GLOBAL_LD_DIRS) \
        $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \
           $(PRIVATE_HOST_GLOBAL_LDFLAGS) \
        ) \
+       $(PRIVATE_LDFLAGS) \
        $(PRIVATE_ALL_OBJECTS) \
        -Wl,--whole-archive \
        $(call normalize-host-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \
@@ -1410,11 +1410,11 @@ $(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),, \
                $(PRIVATE_HOST_GLOBAL_LDFLAGS) \
                -fPIE -pie \
        ) \
+       $(PRIVATE_LDFLAGS) \
        -o $@ \
        $(PRIVATE_LDLIBS)
 endef