[DO NOT MERGE] Workaround to fix klp-modular-dev-plus-aosp build.

Change-Id: I8042b045f20b870de84ea7c4c060c3cbe1cdfe69

diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk
index 4fe0bcd..3757bcb 100644 (file)
--- a/core/combo/TARGET_linux-arm.mk
+++ b/core/combo/TARGET_linux-arm.mk
@@ -245,8 +245,7 @@ $(hide) $(PRIVATE_CXX) \
        $(PRIVATE_LDFLAGS) \
        $(PRIVATE_TARGET_LIBATOMIC) \
        $(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \
-       $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O)) \
-       $(PRIVATE_LDLIBS)
+       $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O))
 endef
 
 define $(combo_2nd_arch_prefix)transform-o-to-executable-inner
@@ -272,8 +271,7 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \
        $(PRIVATE_LDFLAGS) \
        $(PRIVATE_TARGET_LIBATOMIC) \
        $(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \
-       $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O)) \
-       $(PRIVATE_LDLIBS)
+       $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O))
 endef
 
 define $(combo_2nd_arch_prefix)transform-o-to-static-executable-inner

diff --git a/core/combo/TARGET_linux-mips.mk b/core/combo/TARGET_linux-mips.mk
index f52c375..74d81a8 100644 (file)
--- a/core/combo/TARGET_linux-mips.mk
+++ b/core/combo/TARGET_linux-mips.mk
@@ -236,8 +236,7 @@ $(hide) $(PRIVATE_CXX) \
        $(PRIVATE_LDFLAGS) \
        $(PRIVATE_TARGET_LIBATOMIC) \
        $(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \
-       $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O)) \
-       $(PRIVATE_LDLIBS)
+       $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O))
 endef
 
 define $(combo_2nd_arch_prefix)transform-o-to-executable-inner
@@ -263,8 +262,7 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \
        $(PRIVATE_LDFLAGS) \
        $(PRIVATE_TARGET_LIBATOMIC) \
        $(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \
-       $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O)) \
-       $(PRIVATE_LDLIBS)
+       $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O))
 endef
 
 define $(combo_2nd_arch_prefix)transform-o-to-static-executable-inner

diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk
index bc13fb9..3cdf376 100644 (file)
--- a/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@ -199,8 +199,7 @@ $(hide) $(PRIVATE_CXX) \
        $(PRIVATE_LDFLAGS) \
        $(PRIVATE_TARGET_LIBATOMIC) \
        $(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \
-       $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O)) \
-       $(PRIVATE_LDLIBS)
+       $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O))
 endef
 
 define $(combo_2nd_arch_prefix)transform-o-to-executable-inner
@@ -226,8 +225,7 @@ $(hide) $(PRIVATE_CXX) \
        $(PRIVATE_LDFLAGS) \
        $(PRIVATE_TARGET_LIBATOMIC) \
        $(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \
-       $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O)) \
-       $(PRIVATE_LDLIBS)
+       $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O))
 endef
 
 define $(combo_2nd_arch_prefix)transform-o-to-static-executable-inner