StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 5c903372 to jb-mr1-dev

Browse Source 
Change-Id: I4994c77a6570ce654915bfb8c5f6ee4583db86b7
This commit is contained in:
Jean-Baptiste Queru
2012-08-28 13:40:19 -07:00
parent 6f4de4bd13 5c90337229
commit d5096c6a5c
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/combo/TARGET_linux-x86.mk
View File

@@ -188,14 +188,11 @@ $(hide) $(PRIVATE_CXX) \
$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O)) $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O))
endef endef
# Add -fuse-ld=bfd because ld.gold doesn't support "--copy-dt-needed-entries".
define transform-o-to-executable-inner define transform-o-to-executable-inner
$(hide) $(PRIVATE_CXX) \ $(hide) $(PRIVATE_CXX) \
$(TARGET_GLOBAL_LDFLAGS) \ $(TARGET_GLOBAL_LDFLAGS) \
-nostdlib -Bdynamic \ -nostdlib -Bdynamic \
-Wl,-dynamic-linker,/system/bin/linker \ -Wl,-dynamic-linker,/system/bin/linker \
-Wl,--copy-dt-needed-entries \
-fuse-ld=bfd \
-Wl,-z,nocopyreloc \ -Wl,-z,nocopyreloc \
-fPIE -pie \ -fPIE -pie \
-o $@ \ -o $@ \