Merge "Use $(my_prefix)OS instead of HOST_CROSS_OS" (69af20f1) · Commits · e / os / android_build

core/use_lld_setup.mk

+8 −10

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

	ifeq ($(LOCAL_IS_HOST_MODULE),true)
	# Do not use LLD for Darwin host executables or shared libraries. See		# 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.		# 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		my_use_clang_lld := false
	endif		endif
	# http://b/110800681 - lld cannot link Android's Windows modules yet.		# 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		my_use_clang_lld := false
	endif		endif
	endif