commit b7391efbf03d47876fd0747a5cf2199f6b4a503a
author Andrew Hsieh <andrewhsieh@google.com> Wed Jul 25 13:40:30 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Wed Jul 25 13:40:30 2012 -0700
tree 037610f51333e4876e4de227474a2983227835ad
parent 297d6c02bc1e1c63404d8d81df28f3f13046fe85
parent bae121afcda8ffdca9cc03030f790121af251cea

Merge "Add -fuse-ld=bfd to x86 target"

core/combo/TARGET_linux-x86.mk

diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk
index 28c031d..9c0f7b9 100644
--- a/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@ -186,12 +186,14 @@
 endef
 
 
+# Add -fuse-ld=bfd because ld.gold doesn't support "--copy-dt-needed-entries".
 define transform-o-to-executable-inner
 $(hide) $(PRIVATE_CXX) \
 	$(TARGET_GLOBAL_LDFLAGS) \
 	-nostdlib -Bdynamic \
 	-Wl,-dynamic-linker,/system/bin/linker \
 	-Wl,--copy-dt-needed-entries \
+	-fuse-ld=bfd \
 	-Wl,-z,nocopyreloc \
 	-fPIE -pie \
 	-o $@ \