diff options
Diffstat (limited to 'core/clang/config.mk')
| -rw-r--r-- | core/clang/config.mk | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/core/clang/config.mk b/core/clang/config.mk index b887c83..46707c0 100644 --- a/core/clang/config.mk +++ b/core/clang/config.mk @@ -7,13 +7,13 @@ WITHOUT_HOST_CLANG := true endif LLVM_PREBUILTS_VERSION := 3.6 -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_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/ -CLANG := $(LLVM_PREBUILTS_PATH)/clang$(BUILD_EXECUTABLE_SUFFIX) -CLANG_CXX := $(LLVM_PREBUILTS_PATH)/clang++$(BUILD_EXECUTABLE_SUFFIX) -LLVM_AS := $(LLVM_PREBUILTS_PATH)/llvm-as$(BUILD_EXECUTABLE_SUFFIX) -LLVM_LINK := $(LLVM_PREBUILTS_PATH)/llvm-link$(BUILD_EXECUTABLE_SUFFIX) +CLANG := toolchain/clang/bin/clang +CLANG_CXX := toolchain/clang/bin/clang++ +LLVM_AS := toolchain/clang/bin/llvm-as +LLVM_LINK := toolchain/clang/bin/llvm-link CLANG_TBLGEN := $(BUILD_OUT_EXECUTABLES)/clang-tblgen$(BUILD_EXECUTABLE_SUFFIX) LLVM_TBLGEN := $(BUILD_OUT_EXECUTABLES)/llvm-tblgen$(BUILD_EXECUTABLE_SUFFIX) @@ -153,7 +153,5 @@ ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES := libasan # provides to Clang (for supporting features like -ftrapv). COMPILER_RT_CONFIG_EXTRA_STATIC_LIBRARIES := libcompiler_rt-extras -ifeq ($(HOST_PREFER_32_BIT),true) -# We don't have 32-bit prebuilt libLLVM/libclang, so force to build them from source. FORCE_BUILD_LLVM_COMPONENTS := true -endif + |