From 387e4d0601fad468f51cba8286522674914e01cb Mon Sep 17 00:00:00 2001 From: Nick Kralevich Date: Mon, 26 Apr 2010 14:12:19 -0700 Subject: [PATCH] LOCAL_LDFLAGS should come after TARGET_GLOBAL_LDFLAGS A package can define a LOCAL_LDFLAGS. If a LOCAL_LDFLAGS exists, it should come after the global LDFLAGS, to allow the local flags to override the global flags. Change-Id: I6e44c17949c1f11c808d0ed3f327d63fb51a1468 --- core/combo/TARGET_linux-arm.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index 972b10c0a..27e04ce49 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -222,8 +222,8 @@ $(TARGET_CXX) \ $(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \ $(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \ -o $@ \ - $(PRIVATE_LDFLAGS) \ $(TARGET_GLOBAL_LDFLAGS) \ + $(PRIVATE_LDFLAGS) \ $(TARGET_FDO_LIB) \ $(TARGET_LIBGCC) endef @@ -240,8 +240,8 @@ $(TARGET_CXX) -nostdlib -Bdynamic -Wl,-T,$(BUILD_SYSTEM)/armelf.x \ $(TARGET_CRTBEGIN_DYNAMIC_O) \ $(PRIVATE_ALL_OBJECTS) \ $(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \ - $(PRIVATE_LDFLAGS) \ $(TARGET_GLOBAL_LDFLAGS) \ + $(PRIVATE_LDFLAGS) \ $(TARGET_FDO_LIB) \ $(TARGET_LIBGCC) \ $(TARGET_CRTEND_O) @@ -253,8 +253,8 @@ $(TARGET_CXX) -nostdlib -Bstatic -Wl,-T,$(BUILD_SYSTEM)/armelf.x \ -o $@ \ $(TARGET_GLOBAL_LD_DIRS) \ $(TARGET_CRTBEGIN_STATIC_O) \ - $(PRIVATE_LDFLAGS) \ $(TARGET_GLOBAL_LDFLAGS) \ + $(PRIVATE_LDFLAGS) \ $(PRIVATE_ALL_OBJECTS) \ $(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \ $(TARGET_FDO_LIB) \