Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 897b03f9 authored by Pirama Arumuga Nainar's avatar Pirama Arumuga Nainar Committed by android-build-merger
Browse files

Merge "Use $(my_prefix)OS instead of HOST_CROSS_OS" 

am: 69af20f1

Change-Id: I9006ed1815f52f31a05ec9eb190672fc0d0b3da9
parents 71b8769e 69af20f1

core/use_lld_setup.mk

+8 −10
Original line number Diff line number Diff line
@@ -18,14 +18,12 @@ else 
  endif

endif



ifeq ($(LOCAL_IS_HOST_MODULE),true)

# Do not use LLD for Darwin host executables or shared libraries.  See

# https://lld.llvm.org/AtomLLD.html for status of lld for Mach-O.

  ifeq ($(HOST_OS),darwin)

ifeq ($($(my_prefix)OS),darwin)

my_use_clang_lld := false

endif

# http://b/110800681 - lld cannot link Android's Windows modules yet.

  ifeq ($(HOST_CROSS_OS),windows)

ifeq ($($(my_prefix)OS),windows)

my_use_clang_lld := false

endif
 
endif