p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 0cad8ee2: am 572e9acc: Merge "Always use prebuilt clang, even if we\'re explicitly building clang/LLVM." 

* commit '0cad8ee2226d3af8dab854f26da405b15b3655ce':
  Always use prebuilt clang, even if we're explicitly building clang/LLVM.
This commit is contained in:
Tim Murray 2014-04-01 23:32:25 +00:00 committed by Android Git Automerger
parent 4888fe3453 0cad8ee222
commit 7ebce18ac0
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/clang/config.mk
View File

@ -6,13 +6,8 @@ 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
else
LLVM_PREBUILTS_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/3.4/bin
LLVM_PREBUILTS_HEADER_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/3.4/lib/clang/3.4/include/
endif
CLANG := $(LLVM_PREBUILTS_PATH)/clang$(BUILD_EXECUTABLE_SUFFIX)
CLANG_CXX := $(LLVM_PREBUILTS_PATH)/clang++$(BUILD_EXECUTABLE_SUFFIX)