From db2ebfb22022630142cde989cfc4a02ba816851b Mon Sep 17 00:00:00 2001 From: Kito Cheng Date: Fri, 2 Dec 2011 04:48:08 +0800 Subject: [PATCH 1/3][build] Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES Change-Id: I82f3e92de547630613a8573faadccc2e36803604 --- core/combo/TARGET_linux-arm.mk | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk index 5303238..ed4bf58 100644 --- a/core/combo/TARGET_linux-arm.mk +++ b/core/combo/TARGET_linux-arm.mk @@ -257,6 +257,9 @@ $(TARGET_CXX) -nostdlib -Bdynamic -Wl,-T,$(BUILD_SYSTEM)/armelf.x \ -o $@ \ $(TARGET_GLOBAL_LD_DIRS) \ -Wl,-rpath-link=$(TARGET_OUT_INTERMEDIATE_LIBRARIES) \ + -Wl,--whole-archive \ + $(call normalize-host-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \ + -Wl,--no-whole-archive \ $(call normalize-target-libraries,$(PRIVATE_ALL_SHARED_LIBRARIES)) \ $(TARGET_CRTBEGIN_DYNAMIC_O) \ $(PRIVATE_ALL_OBJECTS) \ @@ -277,6 +280,9 @@ $(TARGET_CXX) -nostdlib -Bstatic -Wl,-T,$(BUILD_SYSTEM)/armelf.x \ $(TARGET_GLOBAL_LDFLAGS) \ $(PRIVATE_LDFLAGS) \ $(PRIVATE_ALL_OBJECTS) \ + -Wl,--whole-archive \ + $(call normalize-host-libraries,$(PRIVATE_ALL_WHOLE_STATIC_LIBRARIES)) \ + -Wl,--no-whole-archive \ $(call normalize-target-libraries,$(PRIVATE_ALL_STATIC_LIBRARIES)) \ $(TARGET_FDO_LIB) \ $(TARGET_LIBGCC) \ -- 1.7.7.3