Permalink
Browse files

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

…17847

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
  • Loading branch information...
1 parent 0daef3d commit 6447d52ba8d869a7de254b440703b69d8b4343cf @bob-wilson bob-wilson committed May 9, 2012
Showing with 8 additions and 5 deletions.
  1. +0 −5 Makefile
  2. +8 −0 tools/llvm-config/Makefile
View
5 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
View
8 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

0 comments on commit 6447d52

Please sign in to comment.