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

* commit '7ebce18ac0cff11fbc0877d108463a4538a33194':
  Always use prebuilt clang, even if we're explicitly building clang/LLVM.
This commit is contained in:
Tim Murray 2014-04-02 00:03:34 +00:00 committed by Android Git Automerger
commit a6e629e8d5

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)