Merge "Force to build llvm from source in 64-bit host build."
This commit is contained in:
@@ -6,6 +6,11 @@ WITHOUT_TARGET_CLANG := true
|
|||||||
WITHOUT_HOST_CLANG := true
|
WITHOUT_HOST_CLANG := true
|
||||||
endif
|
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_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/
|
LLVM_PREBUILTS_HEADER_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/3.5/lib/clang/3.5/include/
|
||||||
|
|
||||||
|
@@ -358,7 +358,7 @@ endif
|
|||||||
# ---------------------------------------------------------------
|
# ---------------------------------------------------------------
|
||||||
# Generic tools.
|
# 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
|
# The default PKGDATADIR built in the prebuilt bison is a relative path
|
||||||
# external/bison/data.
|
# external/bison/data.
|
||||||
# To run bison from elsewhere you need to set up enviromental variable
|
# To run bison from elsewhere you need to set up enviromental variable
|
||||||
|
Reference in New Issue
Block a user