6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-13 20:32:21 +00:00
Code Issues Projects Releases Wiki Activity

have the makefiles check the llvm-config error code instead of charging

Browse Source 
on an producing weird link errors.  Patch by Yuri Gribov!


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@112714 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2010-09-01 16:11:17 +00:00
parent 0b5b18340b
commit f636aa9c7e
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile.rules
View File

@ -917,9 +917,20 @@ endif
LLVMLibsOptions += -lLLVM-$(LLVMVersion) LLVMLibsOptions += -lLLVM-$(LLVMVersion)
LLVMLibsPaths += $(SharedLibDir)/$(SharedPrefix)LLVM-$(LLVMVersion)$(SHLIBEXT) LLVMLibsPaths += $(SharedLibDir)/$(SharedPrefix)LLVM-$(LLVMVersion)$(SHLIBEXT)
else else
LLVMLibsOptions += $(shell $(LLVM_CONFIG) --libs $(LINK_COMPONENTS))
LLVMLibsPaths += $(LLVM_CONFIG) \ ifndef NO_LLVM_CONFIG
$(shell $(LLVM_CONFIG) --libfiles $(LINK_COMPONENTS)) LLVMConfigLibs := $(shell $(LLVM_CONFIG) --libs $(LINK_COMPONENTS) || echo Error)
ifeq ($(LLVMConfigLibs),Error)
$(error llvm-config --libs failed)
endif
LLVMLibsOptions += $(LLVMConfigLibs)
LLVMConfigLibfiles := $(shell $(LLVM_CONFIG) --libfiles $(LINK_COMPONENTS) || echo Error)
ifeq ($(LLVMConfigLibfiles),Error)
$(error llvm-config --libfiles failed)
endif
LLVMLibsPaths += $(LLVM_CONFIG) $(LLVMConfigLibfiles)
endif
endif endif
endif endif
endif endif

4
lib/CompilerDriver/Makefile
View File

@ -10,9 +10,11 @@
LEVEL = ../.. LEVEL = ../..
# We don't want this library to appear in `llvm-config --libs` output, so its # We don't want this library to appear in `llvm-config --libs` output, so its
# name doesn't start with "LLVM". # name doesn't start with "LLVM" and NO_LLVM_CONFIG is set.
LIBRARYNAME = CompilerDriver LIBRARYNAME = CompilerDriver
LINK_COMPONENTS = support system LINK_COMPONENTS = support system
NO_LLVM_CONFIG = 1
include $(LEVEL)/Makefile.common include $(LEVEL)/Makefile.common