am 5137d458: Merge "Force to build llvm from source in 64-bit host build."

* commit '5137d4584e60dea68715dbcae5e276b3af965460':
  Force to build llvm from source in 64-bit host build.
This commit is contained in:
Ying Wang
2014-05-16 18:59:23 +00:00
committed by Android Git Automerger
2 changed files with 6 additions and 1 deletions

View File

@@ -6,6 +6,11 @@ WITHOUT_TARGET_CLANG := true
WITHOUT_HOST_CLANG := true
endif
# We don't have 64-bit host prebuilts yet.
ifeq (true,$(HOST_IS_64_BIT))
FORCE_BUILD_LLVM_COMPONENTS := true
endif
LLVM_PREBUILTS_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/3.5/bin
LLVM_PREBUILTS_HEADER_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/3.5/lib/clang/3.5/include/

View File

@@ -358,7 +358,7 @@ endif
# ---------------------------------------------------------------
# Generic tools.
LEX := prebuilts/misc/$(BUILD_OS)-$(BUILD_ARCH)/flex/flex-2.5.39
LEX := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/flex/flex-2.5.39
# The default PKGDATADIR built in the prebuilt bison is a relative path
# external/bison/data.
# To run bison from elsewhere you need to set up enviromental variable