commit 4c9c895ab8acf846226eeacb82109026eab20586
author Nick Kralevich <nnk@google.com> Wed Jul 25 23:00:29 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Jul 25 23:00:29 2012 -0700
tree 007b6f49140429902a2ef5c681efb40f7ffc9f8d
parent f116e9bc84411c4923ef42c3cdd4378de0610d1d
parent 07a06f6e4487f2ad7d667d134fe19a089bee8412

am 07a06f6e: am f0daadf6: am 297d6c02: Merge "Add property_contexts to SELINUX_DEPENDS."

* commit '07a06f6e4487f2ad7d667d134fe19a089bee8412':
  Add property_contexts to SELINUX_DEPENDS.

core/combo/TARGET_linux-x86.mk

diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk
index 82c5dc2..bf6daf8 100644
--- a/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@ -185,13 +185,14 @@
 	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O))
 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 $@ \