[llvm-commits] [llvm] r156448 - in /llvm/trunk: Makefile tools/llvm-config/Makefile

[Bob Wilson]

Author: bwilson
Date: Tue May  8 19:07:02 2012
New Revision: 156448

URL: http://llvm.org/viewvc/llvm-project?rev=156448&view=rev
Log:
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.

Modified:
    llvm/trunk/Makefile
    llvm/trunk/tools/llvm-config/Makefile

Modified: llvm/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile?rev=156448&r1=156447&r2=156448&view=diff
==============================================================================
--- llvm/trunk/Makefile (original)
+++ llvm/trunk/Makefile Tue May  8 19:07:02 2012
@@ -102,11 +102,6 @@
 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
 

Modified: llvm/trunk/tools/llvm-config/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-config/Makefile?rev=156448&r1=156447&r2=156448&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-config/Makefile (original)
+++ llvm/trunk/tools/llvm-config/Makefile Tue May  8 19:07:02 2012
@@ -57,3 +57,11 @@
 	  >> 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