StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove WITHOUT_(HOST|TARGET)_CLANG."

Browse Source
This commit is contained in:
Dan Albert
2015-09-16 23:24:40 +00:00
committed by Gerrit Code Review
parent 6fb36397e5 32f7ff14ce
commit 3ee9daac6a
2 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/binary.mk
View File

@@ -198,10 +198,6 @@ else ifeq ($(USE_CLANG_PLATFORM_BUILD),true)
endif endif
endif endif
ifeq ($(strip $($(LOCAL_2ND_ARCH_VAR_PREFIX)WITHOUT_$(my_prefix)CLANG)),true)
my_clang :=
endif
my_cpp_std_version := -std=gnu++14 my_cpp_std_version := -std=gnu++14
ifdef LOCAL_SDK_VERSION ifdef LOCAL_SDK_VERSION
# The NDK handles this itself. # The NDK handles this itself.

6
core/clang/config.mk
View File

@@ -1,11 +1,5 @@
## Clang configurations. ## Clang configurations.
# WITHOUT_CLANG covers both HOST and TARGET
ifeq ($(WITHOUT_CLANG),true)
WITHOUT_TARGET_CLANG := true
WITHOUT_HOST_CLANG := true
endif
LLVM_PREBUILTS_VERSION := 3.6 LLVM_PREBUILTS_VERSION := 3.6
LLVM_PREBUILTS_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/$(LLVM_PREBUILTS_VERSION)/bin LLVM_PREBUILTS_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/$(LLVM_PREBUILTS_VERSION)/bin
LLVM_RTLIB_PATH := $(LLVM_PREBUILTS_PATH)/../lib/clang/$(LLVM_PREBUILTS_VERSION)/lib/linux/ LLVM_RTLIB_PATH := $(LLVM_PREBUILTS_PATH)/../lib/clang/$(LLVM_PREBUILTS_VERSION)/lib/linux/