tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
* commit '0a196075eeddef89a5cc8b679adde7c0791031bf':
  Split WITHOUT_CLANG to WITHOUT_HOST_CLANG and WITHOUT_TARGET_CLANG
This commit is contained in:
Ying Wang 2014-03-11 02:11:29 +00:00 committed by Android Git Automerger
commit f91a014f6f
4 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/binary.mk
View file

@ -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

8
core/clang/config.mk
View file

@ -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)) 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

2
core/combo/TARGET_linux-arm64.mk
View file

@ -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)

2
core/combo/TARGET_linux-mips64.mk
View file

@ -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)