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

Commit df925cef authored Mar 11, 2014 by Ying Wang Committed by Android Git Automerger Mar 11, 2014

am f91a014f: am 0a196075: am 446f00c9: am ce156811: Merge "Split WITHOUT_CLANG...

am f91a014f: am 0a196075: am 446f00c9: am ce156811: Merge "Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG"

* commit 'f91a014f':
  Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG

parents 67d675af f91a014f

core/binary.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -143,7 +143,7 @@ ifeq ($(strip $(LOCAL_ADDRESS_SANITIZER)),true)
	my_static_libraries += $(ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES)		my_static_libraries += $(ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES)
	endif		endif

	ifeq ($(strip $($(LOCAL_2ND_ARCH_VAR_PREFIX)WITHOUT_CLANG)),true)		ifeq ($(strip $($(LOCAL_2ND_ARCH_VAR_PREFIX)WITHOUT_$(my_prefix)CLANG)),true)
	LOCAL_CLANG :=		LOCAL_CLANG :=
	endif		endif

core/clang/config.mk

+8 −0

Original line number	Original line	Diff line number	Diff line
			## Clang configurations.

			# WITHOUT_CLANG covers both HOST and TARGET
			ifeq ($(WITHOUT_CLANG),true)
			WITHOUT_TARGET_CLANG := true
			WITHOUT_HOST_CLANG := true
			endif

	ifeq (true,$(FORCE_BUILD_LLVM_COMPONENTS))		ifeq (true,$(FORCE_BUILD_LLVM_COMPONENTS))
	LLVM_PREBUILTS_PATH := $(BUILD_OUT_EXECUTABLES)		LLVM_PREBUILTS_PATH := $(BUILD_OUT_EXECUTABLES)
	LLVM_PREBUILTS_HEADER_PATH := external/clang/lib/include		LLVM_PREBUILTS_HEADER_PATH := external/clang/lib/include

core/combo/TARGET_linux-arm64.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -48,7 +48,7 @@ $(error Unknown ARM architecture version: $(TARGET_ARCH_VARIANT))
	endif		endif

	# TODO: Enable Clang when aarch64 prebuilt is added		# TODO: Enable Clang when aarch64 prebuilt is added
	WITHOUT_CLANG := true		WITHOUT_TARGET_CLANG := true

	include $(TARGET_ARCH_SPECIFIC_MAKEFILE)		include $(TARGET_ARCH_SPECIFIC_MAKEFILE)

core/combo/TARGET_linux-mips64.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -48,7 +48,7 @@ $(error Unknown MIPS architecture variant: $(TARGET_ARCH_VARIANT))
	endif		endif

	# TODO: Enable Clang when its mips64 prebuilt is added		# TODO: Enable Clang when its mips64 prebuilt is added
	WITHOUT_CLANG := true		WITHOUT_TARGET_CLANG := true

	include $(TARGET_ARCH_SPECIFIC_MAKEFILE)		include $(TARGET_ARCH_SPECIFIC_MAKEFILE)