From: Bob Wilson <bob.wilson@apple.com>
Date: Wed, 9 May 2012 00:07:02 +0000 (+0000)
Subject: Do not install llvm-config-host for cross-builds of clang. rdar://11317847
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6447d52ba8d869a7de254b440703b69d8b4343cf;p=oota-llvm.git

Do not install llvm-config-host for cross-builds of clang. rdar://11317847

My previous change to install llvm-config-host for cross-builds resulted
in that file being installed even when the normal llvm-config was not
installed, e.g., when building the install-clang target.  Daniel suggested
this alternative, which solves the immediate problem and also avoids the gunk
in the top-level makefile.

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

diff --git a/Makefile b/Makefile
index 590fab1222c..ec24862ad6f 100644
--- a/Makefile
+++ b/Makefile
@@ -102,11 +102,6 @@ endif
 ifeq ($(LLVM_CROSS_COMPILING),1)
 all:: cross-compile-build-tools
 
-install:: $(DESTDIR)$(PROJ_bindir)
-	$(Echo) Installing llvm-config-host
-	$(Verb) $(ProgInstall) $(BuildLLVMToolDir)/llvm-config \
-	  $(DESTDIR)$(PROJ_bindir)/llvm-config-host
-
 clean::
 	$(Verb) rm -rf BuildTools
 
diff --git a/tools/llvm-config/Makefile b/tools/llvm-config/Makefile
index 3f11730a37d..e8c86929e18 100644
--- a/tools/llvm-config/Makefile
+++ b/tools/llvm-config/Makefile
@@ -57,3 +57,11 @@ $(ObjDir)/BuildVariables.inc: $(BUILDVARIABLES_SRCPATH) Makefile $(ObjDir)/.dir
 	  >> temp.sed
 	$(Verb) $(SED) -f temp.sed < $< > $@
 	$(Verb) $(RM) temp.sed
+
+# When cross-compiling, install a version of llvm-config that runs on the host.
+ifeq ($(LLVM_CROSS_COMPILING),1)
+install:: $(DESTDIR)$(PROJ_bindir)
+	$(Echo) Installing llvm-config-host
+	$(Verb) $(ProgInstall) $(BuildLLVMToolDir)/llvm-config \
+	  $(DESTDIR)$(PROJ_bindir)/llvm-config-host
+endif