commit 897b03f9eebe735cfe8fd0480cce25365c90dc6a
author Pirama Arumuga Nainar <pirama@google.com> Wed Jun 27 13:14:30 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jun 27 13:14:30 2018 -0700
tree e74f705a73c964f4e8b7211b68722da49a1560bb
parent 71b8769e5cc0e7735dad7bc846234884a7954181
parent 69af20f184bbfff7b626a667839282b127aaa63b

Merge "Use $(my_prefix)OS instead of HOST_CROSS_OS"
am: 69af20f184

Change-Id: I9006ed1815f52f31a05ec9eb190672fc0d0b3da9

core/use_lld_setup.mk

diff --git a/core/use_lld_setup.mk b/core/use_lld_setup.mk
index b0386d5..5f0f412 100644
--- a/core/use_lld_setup.mk
+++ b/core/use_lld_setup.mk
@@ -18,14 +18,12 @@
   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)
-    my_use_clang_lld := false
-  endif
-  # http://b/110800681 - lld cannot link Android's Windows modules yet.
-  ifeq ($(HOST_CROSS_OS),windows)
-    my_use_clang_lld := false
-  endif
+# 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 ($($(my_prefix)OS),darwin)
+my_use_clang_lld := false
+endif
+# http://b/110800681 - lld cannot link Android's Windows modules yet.
+ifeq ($($(my_prefix)OS),windows)
+my_use_clang_lld := false
 endif