StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove variables exported by Soong"

Browse Source
This commit is contained in:
Treehugger Robot
2016-12-15 07:19:03 +00:00
committed by Gerrit Code Review
parent e9c4079e91 56c6a9d1ff
commit f61205d5c7
4 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/clang/config.mk
View File

@@ -1,14 +1,7 @@
## Clang configurations. ## Clang configurations.
LLVM_PREBUILTS_PATH := $(LLVM_PREBUILTS_BASE)/$(BUILD_OS)-x86/$(LLVM_PREBUILTS_VERSION)/bin
LLVM_RTLIB_PATH := $(LLVM_PREBUILTS_PATH)/../lib64/clang/$(LLVM_RELEASE_VERSION)/lib/linux/ LLVM_RTLIB_PATH := $(LLVM_PREBUILTS_PATH)/../lib64/clang/$(LLVM_RELEASE_VERSION)/lib/linux/
# These will come from Soong, drop the environment versions
unexport CLANG
unexport CLANG_CXX
unexport CCC_CC
unexport CCC_CXX
CLANG_TBLGEN := $(BUILD_OUT_EXECUTABLES)/clang-tblgen$(BUILD_EXECUTABLE_SUFFIX) CLANG_TBLGEN := $(BUILD_OUT_EXECUTABLES)/clang-tblgen$(BUILD_EXECUTABLE_SUFFIX)
LLVM_TBLGEN := $(BUILD_OUT_EXECUTABLES)/llvm-tblgen$(BUILD_EXECUTABLE_SUFFIX) LLVM_TBLGEN := $(BUILD_OUT_EXECUTABLES)/llvm-tblgen$(BUILD_EXECUTABLE_SUFFIX)

2
core/clang/versions.mk
View File

@@ -1,5 +1,3 @@
## Clang/LLVM release versions. ## Clang/LLVM release versions.
LLVM_RELEASE_VERSION := 3.8
LLVM_PREBUILTS_VERSION ?= clang-3289846 LLVM_PREBUILTS_VERSION ?= clang-3289846
LLVM_PREBUILTS_BASE ?= prebuilts/clang/host

7
core/config.mk
View File

@@ -716,8 +716,11 @@ $(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_CPU_VARIANT := $(call first_non_empt
$(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := default $(TARGET_2ND_ARCH_VAR_PREFIX)DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := default
endif endif
# define clang/llvm tools and global flags # These will come from Soong, drop the environment versions
include $(BUILD_SYSTEM)/clang/config.mk unexport CLANG
unexport CLANG_CXX
unexport CCC_CC
unexport CCC_CXX
# ############################################################### # ###############################################################
# Collect a list of the SDK versions that we could compile against # Collect a list of the SDK versions that we could compile against

2
core/main.mk
View File

@@ -50,6 +50,8 @@ endif
include $(SOONG_MAKEVARS_MK) include $(SOONG_MAKEVARS_MK)
include $(BUILD_SYSTEM)/clang/config.mk
# Write the build number to a file so it can be read back in # Write the build number to a file so it can be read back in
# without changing the command line every time. Avoids rebuilds # without changing the command line every time. Avoids rebuilds
# when using ninja. # when using ninja.