summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2011-11-04 10:11:26 -0700
committerNick Kralevich <nnk@google.com>2011-11-04 10:22:55 -0700
commit7939908c8310342c8e1b717c4599273a782b3c2b (patch)
tree21934e597ce223a46480bd97db15e5302d3ffe1b
parent8e8a7b1f0fb9daf8d4434e18a9fff5c28f849cb8 (diff)
downloadbionic-7939908c8310342c8e1b717c4599273a782b3c2b.zip
bionic-7939908c8310342c8e1b717c4599273a782b3c2b.tar.gz
bionic-7939908c8310342c8e1b717c4599273a782b3c2b.tar.bz2
linker: set LOCAL_NO_CRT := true
Use LOCAL_NO_CRT to prevent linking against crtbegin.o, rather than messing with build rules. This also prevents linking against crtend.o, which isn't needed for the linker. Change-Id: I0c5b9999be7e8676560fe145c1c033ffce8db4d1
-rw-r--r--linker/Android.mk11
1 files changed, 3 insertions, 8 deletions
diff --git a/linker/Android.mk b/linker/Android.mk
index 60f291c..7793f8d 100644
--- a/linker/Android.mk
+++ b/linker/Android.mk
@@ -75,6 +75,9 @@ LOCAL_STATIC_LIBRARIES := libc_nomalloc
LOCAL_MODULE_CLASS := EXECUTABLES
LOCAL_MODULE_SUFFIX := $(TARGET_EXECUTABLE_SUFFIX)
+# we don't want crtbegin.o (because we have begin.o), so unset it
+# just for this module
+LOCAL_NO_CRT := true
include $(BUILD_SYSTEM)/dynamic_binary.mk
@@ -86,11 +89,3 @@ $(linked_module): $(TARGET_CRTBEGIN_STATIC_O) $(all_objects) $(all_libraries) $(
#
# end of BUILD_EXECUTABLE hack
#
-
-# we don't want crtbegin.o (because we have begin.o), so unset it
-# just for this module
-$(LOCAL_BUILT_MODULE): TARGET_CRTBEGIN_STATIC_O :=
-# This line is not strictly necessary because the dynamic linker is built
-# as a static executable, but it won't hurt if in the future we start
-# building the linker as a dynamic one.
-$(LOCAL_BUILT_MODULE): TARGET_CRTBEGIN_DYNAMIC_O :=