replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.

llvm-svn: 156448
This commit is contained in:
Bob Wilson 2012-05-09 00:07:02 +00:00
parent 89919ccd17
commit 7789aae96d
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
llvm/Makefile
View File

@ -102,11 +102,6 @@ endif
ifeq ($(LLVM_CROSS_COMPILING),1) ifeq ($(LLVM_CROSS_COMPILING),1)
all:: cross-compile-build-tools 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:: clean::
$(Verb) rm -rf BuildTools $(Verb) rm -rf BuildTools

8
llvm/tools/llvm-config/Makefile
View File

@ -57,3 +57,11 @@ $(ObjDir)/BuildVariables.inc: $(BUILDVARIABLES_SRCPATH) Makefile $(ObjDir)/.dir
>> temp.sed >> temp.sed
$(Verb) $(SED) -f temp.sed < $< > $@ $(Verb) $(SED) -f temp.sed < $< > $@
$(Verb) $(RM) 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