commit 645b8db09a9b834b2e776685ada60ba58f0dcaa1
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jun 27 20:22:23 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 27 20:22:23 2018 +0000
tree 42d53593702f39267d782ea8f25f0430cb2aea52
parent 69af20f184bbfff7b626a667839282b127aaa63b
parent b448834e962e185ffb09d8a00ee92b79216dd176

Merge "Do not set entry-point for Windows"

core/config_sanitizers.mk

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index e2ac03c..d9a4e67 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -12,7 +12,7 @@
 my_global_sanitize_diag :=
 ifeq ($(my_clang),true)
   ifdef LOCAL_IS_HOST_MODULE
-    ifneq ($(HOST_CROSS_OS),windows)
+    ifneq ($($(my_prefix)OS),windows)
       my_global_sanitize := $(strip $(SANITIZE_HOST))
 
       # SANITIZE_HOST=true is a deprecated way to say SANITIZE_HOST=address.

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