openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Switch to using BUILD instead of HOST variables. 

This fixes issues where we cross-compile Windows binaries on a Linux host.

Change-Id: Ief6558bf9a565b6df7b63207f6e92ef272066463
This commit is contained in:
Stephen Hines 2013-09-19 12:43:00 -07:00
parent 578a84dc45
commit 09e27f1afc
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/llvm_config.mk
View File

@ -1,17 +1,17 @@
ifeq (true,$(FORCE_BUILD_LLVM_COMPONENTS))
LLVM_PREBUILTS_PATH := $(HOST_OUT_EXECUTABLES)
LLVM_PREBUILTS_PATH := $(BUILD_OUT_EXECUTABLES)
LLVM_PREBUILTS_HEADER_PATH := external/clang/lib/include
else
LLVM_PREBUILTS_PATH := prebuilts/clang/$(HOST_OS)-x86/host/3.3/bin
LLVM_PREBUILTS_HEADER_PATH := prebuilts/clang/$(HOST_OS)-x86/host/3.3/lib/clang/3.3/include/
endif
CLANG := $(LLVM_PREBUILTS_PATH)/clang$(HOST_EXECUTABLE_SUFFIX)
CLANG_CXX := $(LLVM_PREBUILTS_PATH)/clang++$(HOST_EXECUTABLE_SUFFIX)
CLANG_TBLGEN := $(LLVM_PREBUILTS_PATH)/clang-tblgen$(HOST_EXECUTABLE_SUFFIX)
LLVM_AS := $(LLVM_PREBUILTS_PATH)/llvm-as$(HOST_EXECUTABLE_SUFFIX)
LLVM_LINK := $(LLVM_PREBUILTS_PATH)/llvm-link$(HOST_EXECUTABLE_SUFFIX)
TBLGEN := $(LLVM_PREBUILTS_PATH)/tblgen$(HOST_EXECUTABLE_SUFFIX)
CLANG := $(LLVM_PREBUILTS_PATH)/clang$(BUILD_EXECUTABLE_SUFFIX)
CLANG_CXX := $(LLVM_PREBUILTS_PATH)/clang++$(BUILD_EXECUTABLE_SUFFIX)
CLANG_TBLGEN := $(LLVM_PREBUILTS_PATH)/clang-tblgen$(BUILD_EXECUTABLE_SUFFIX)
LLVM_AS := $(LLVM_PREBUILTS_PATH)/llvm-as$(BUILD_EXECUTABLE_SUFFIX)
LLVM_LINK := $(LLVM_PREBUILTS_PATH)/llvm-link$(BUILD_EXECUTABLE_SUFFIX)
TBLGEN := $(LLVM_PREBUILTS_PATH)/tblgen$(BUILD_EXECUTABLE_SUFFIX)
define do-clang-flags-subst
TARGET_GLOBAL_CLANG_FLAGS := $(subst $(1),$(2),$(TARGET_GLOBAL_CLANG_FLAGS))