diff options
| author | Ying Wang <wangying@google.com> | 2014-03-10 18:23:08 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-03-10 18:59:12 -0700 |
| commit | ba8b377d89a3bd37ef6112e21c852be75e07db0a (patch) | |
| tree | 658ecb5e764b86fb76256c76be0e2abe51e63e3d | |
| parent | 775d15e001d48d72a1b76982b1b5faa1eb37158f (diff) | |
| download | build-ba8b377d89a3bd37ef6112e21c852be75e07db0a.zip build-ba8b377d89a3bd37ef6112e21c852be75e07db0a.tar.gz build-ba8b377d89a3bd37ef6112e21c852be75e07db0a.tar.bz2 | |
Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG
Still keep WITHOUT_CLANG, which enables both.
Bug: 13402154
Change-Id: I32cb668223997719875751bf3d64f592d6086830
| -rw-r--r-- | core/binary.mk | 2 | ||||
| -rw-r--r-- | core/clang/config.mk | 8 | ||||
| -rw-r--r-- | core/combo/TARGET_linux-arm64.mk | 2 | ||||
| -rw-r--r-- | core/combo/TARGET_linux-mips64.mk | 2 |
4 files changed, 11 insertions, 3 deletions
diff --git a/core/binary.mk b/core/binary.mk index bb83126..c57a793 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -143,7 +143,7 @@ ifeq ($(strip $(LOCAL_ADDRESS_SANITIZER)),true) my_static_libraries += $(ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES) 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 := endif diff --git a/core/clang/config.mk b/core/clang/config.mk index 1fd69d7..96f860d 100644 --- a/core/clang/config.mk +++ b/core/clang/config.mk @@ -1,3 +1,11 @@ +## 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)) LLVM_PREBUILTS_PATH := $(BUILD_OUT_EXECUTABLES) LLVM_PREBUILTS_HEADER_PATH := external/clang/lib/include diff --git a/core/combo/TARGET_linux-arm64.mk b/core/combo/TARGET_linux-arm64.mk index 7a7a0c9..290cebe 100644 --- a/core/combo/TARGET_linux-arm64.mk +++ b/core/combo/TARGET_linux-arm64.mk @@ -48,7 +48,7 @@ $(error Unknown ARM architecture version: $(TARGET_ARCH_VARIANT)) endif # TODO: Enable Clang when aarch64 prebuilt is added -WITHOUT_CLANG := true +WITHOUT_TARGET_CLANG := true include $(TARGET_ARCH_SPECIFIC_MAKEFILE) diff --git a/core/combo/TARGET_linux-mips64.mk b/core/combo/TARGET_linux-mips64.mk index c1c6439..099edfa 100644 --- a/core/combo/TARGET_linux-mips64.mk +++ b/core/combo/TARGET_linux-mips64.mk @@ -48,7 +48,7 @@ $(error Unknown MIPS architecture variant: $(TARGET_ARCH_VARIANT)) endif # TODO: Enable Clang when its mips64 prebuilt is added -WITHOUT_CLANG := true +WITHOUT_TARGET_CLANG := true include $(TARGET_ARCH_SPECIFIC_MAKEFILE) |