build/Make: Define a TARGET_NATIVE_ARCH variable to be a bit more precise than

ARCH, which gets tested in many more contexts.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@144434 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile b/Makefile
index a08818c2109aaffe6d74c8be5374c942b368c07c..0ef6fb4fbb20dcf37d947de4f0178a6ab0815e5c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -126,7 +126,7 @@ cross-compile-build-tools:
         $(MAKE) -C BuildTools \
          BUILD_DIRS_ONLY=1 \
          UNIVERSAL= \
-         ARCH="$(ARCH)" \
+         TARGET_NATIVE_ARCH="$(TARGET_NATIVE_ARCH)" \
          TARGETS_TO_BUILD="$(TARGETS_TO_BUILD)" \
          ENABLE_OPTIMIZED=$(ENABLE_OPTIMIZED) \
          ENABLE_PROFILING=$(ENABLE_PROFILING) \

diff --git a/Makefile.config.in b/Makefile.config.in
index 47044a3a8d3da5ec05849e40a7e1400c63671f77..dd948bf1f3603dcc337475dc65ff23382412048a 100644 (file)
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -107,6 +107,7 @@ TARGET_OS=@TARGET_OS@
 
 # Target hardware architecture
 ARCH=@ARCH@
+TARGET_NATIVE_ARCH := $(ARCH)
 
 # Indicates, whether we're cross-compiling LLVM or not
 LLVM_CROSS_COMPILING=@LLVM_CROSS_COMPILING@

diff --git a/Makefile.rules b/Makefile.rules
index 7bef65078845e62da1a2d5de960343182c389dd6..e5719b329ab156a03a80a2d97942be4e1abe91a6 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -81,6 +81,11 @@ LLVMBuildMakeFrag := $(PROJ_OBJ_ROOT)/Makefile.llvmbuild
 LLVMConfigLibraryDependenciesInc := \
        $(PROJ_OBJ_ROOT)/tools/llvm-config-2/LibraryDependencies.inc
 
+# This is for temporary backwards compatibility.
+ifndef TARGET_NATIVE_ARCH
+TARGET_NATIVE_ARCH := $(ARCH)
+endif
+
 # The rule to create the LLVMBuild Makefile fragment as well as the llvm-config
 # library table.
 #
@@ -92,7 +97,7 @@ LLVMConfigLibraryDependenciesInc := \
 $(LLVMBuildMakeFrag): $(PROJ_SRC_ROOT)/Makefile.rules
        $(Echo) Constructing LLVMBuild project information.
        $(Verb) $(LLVMBuildTool) \
-         --native-target "$(ARCH)" \
+         --native-target "$(TARGET_NATIVE_ARCH)" \
          --enable-targets "$(TARGETS_TO_BUILD)" \
          --write-library-table $(LLVMConfigLibraryDependenciesInc) \
          --write-make-fragment $(LLVMBuildMakeFrag)