p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 87bde62d: Merge "Fix error of PRIVATE_LDLIBS introduced by de36cd72." 

* commit '87bde62df4e5bb76f058394cd7fff8eaaf7e0d0c':
  Fix error of PRIVATE_LDLIBS introduced by de36cd72.
This commit is contained in:
Ying Wang 2014-11-07 18:37:42 +00:00 committed by Android Git Automerger
parent 40eb848d7d 87bde62df4
commit 2874d0ba8c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/combo/TARGET_linux-x86_64.mk
View File

@ -171,7 +171,8 @@ $(hide) $(PRIVATE_CXX) \
$(PRIVATE_TARGET_LIBATOMIC) \
$(if $(filter true,$(NATIVE_COVERAGE)),$(PRIVATE_TARGET_LIBGCOV)) \
$(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \
$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O))
$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O)) \
$(PRIVATE_LDLIBS)
endef
define transform-o-to-executable-inner
@ -222,6 +223,5 @@ $(hide) $(PRIVATE_CXX) \
$(call normalize-target-libraries,$(filter %libcompiler_rt.a,$(PRIVATE_ALL_STATIC_LIBRARIES))) \
$(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \
-Wl,--end-group \
$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O)) \
$(PRIVATE_LDLIBS)
$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O))
endef