diff options
| author | Ying Wang <wangying@google.com> | 2014-05-16 18:55:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-16 18:55:48 +0000 |
| commit | 5137d4584e60dea68715dbcae5e276b3af965460 (patch) | |
| tree | a099bf31fe839760f3241cc2787b4d195f3de3bd | |
| parent | c0f10644bf877fae44e8aa5ebfff41f0e27af197 (diff) | |
| parent | 6374153fbf008f39ef5de03120de2b218d1d0701 (diff) | |
| download | build-5137d4584e60dea68715dbcae5e276b3af965460.tar.gz | |
Merge "Force to build llvm from source in 64-bit host build."
| -rw-r--r-- | core/clang/config.mk | 5 | ||||
| -rw-r--r-- | core/config.mk | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/core/clang/config.mk b/core/clang/config.mk index d44be526b1..227169d4e2 100644 --- a/core/clang/config.mk +++ b/core/clang/config.mk @@ -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/ diff --git a/core/config.mk b/core/config.mk index 84ff3fea4e..287944e96e 100644 --- a/core/config.mk +++ b/core/config.mk @@ -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 |