6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-08-26 23:29:22 +00:00
Code Issues Projects Releases Wiki Activity

Bugfix for llvm-config support

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@30087 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2006-09-04 05:23:20 +00:00
parent 55e6c4ab94
commit 0a1db82859
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Makefile.rules
View File

@ -73,6 +73,7 @@ PreConditions := $(ConfigStatusScript) $(ObjMakefiles)
ifneq ($(MakefileCommonIn),) ifneq ($(MakefileCommonIn),)
PreConditions += $(MakefileCommon) PreConditions += $(MakefileCommon)
endif endif
ifneq ($(MakefileConfigIn),) ifneq ($(MakefileConfigIn),)
PreConditions += $(MakefileConfig) PreConditions += $(MakefileConfig)
endif endif
@ -304,7 +305,7 @@ endif
ifndef GCCLD ifndef GCCLD
GCCLD := $(LLVMToolDir)/gccld$(EXEEXT) GCCLD := $(LLVMToolDir)/gccld$(EXEEXT)
endif endif
ifndef LDIS ifndef LLVMDIS
LLVMDIS := $(LLVMToolDir)/llvm-dis$(EXEEXT) LLVMDIS := $(LLVMToolDir)/llvm-dis$(EXEEXT)
endif endif
ifndef LLI ifndef LLI
@ -707,10 +708,19 @@ LLVMUsedLibs := $(patsubst %.a.o, lib%.a, $(addsuffix .o, $(LLVMLIBS)))
LLVMLibsPaths := $(addprefix $(LLVMLibDir)/,$(LLVMUsedLibs)) LLVMLibsPaths := $(addprefix $(LLVMLibDir)/,$(LLVMUsedLibs))
endif endif
ifneq ($(strip($(filter-out clean clean-local dist-clean,$(MAKECMDGOALS)))),) ifeq ($(strip $(filter clean clean-local dist-clean,$(MAKECMDGOALS))),)
ifdef LINK_COMPONENTS ifdef LINK_COMPONENTS
ProjLibsOptions := $(shell $(LLVM_CONFIG) --libs $(LINK_COMPONENTS))
ProjLibsPaths := $(shell $(LLVM_CONFIG) --libfiles $(LINK_COMPONENTS)) # If LLVM_CONFIG doesn't exist, build it. This can happen if you do a make
# clean in tools, then do a make in tools (instead of at the top level).
$(LLVM_CONFIG):
@echo "*** llvm-config doesn't exist - rebuilding it."
@$(MAKE) -C $(PROJ_OBJ_ROOT)/tools/llvm-config
$(ToolDir)/$(strip $(TOOLNAME))$(EXEEXT): $(LLVM_CONFIG)
ProjLibsOptions = $(shell $(LLVM_CONFIG) --libs $(LINK_COMPONENTS))
ProjLibsPaths = $(shell $(LLVM_CONFIG) --libfiles $(LINK_COMPONENTS))
endif endif
endif endif
@ -989,13 +999,6 @@ else
ToolBuildPath := $(ToolDir)/$(strip $(TOOLNAME))$(EXEEXT) ToolBuildPath := $(ToolDir)/$(strip $(TOOLNAME))$(EXEEXT)
endif endif
#---------------------------------------------------------
# Tell make that we need to rebuild subdirectories before
# we can link the tool. This affects things like LLI which
# has library subdirectories.
#---------------------------------------------------------
$(ToolBuildPath): $(addsuffix /.makeall, $(PARALLEL_DIRS))
#--------------------------------------------------------- #---------------------------------------------------------
# Provide targets for building the tools # Provide targets for building the tools
#--------------------------------------------------------- #---------------------------------------------------------
@ -1012,7 +1015,7 @@ else
$(ToolBuildPath): $(ToolDir)/.dir $(ToolBuildPath): $(ToolDir)/.dir
endif endif
$(ToolBuildPath): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) $(ToolBuildPath): $(ObjectsO) $(LLVM_CONFIG) $(ProjLibsPaths) $(LLVMLibsPaths)
$(Echo) Linking $(BuildMode) executable $(TOOLNAME) $(StripWarnMsg) $(Echo) Linking $(BuildMode) executable $(TOOLNAME) $(StripWarnMsg)
$(Verb) $(LTLink) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) \ $(Verb) $(LTLink) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) \
$(LLVMLibsOptions) $(ExtraLibs) $(TOOLLINKOPTSB) $(LIBS) $(LLVMLibsOptions) $(ExtraLibs) $(TOOLLINKOPTSB) $(LIBS)
@ -1417,7 +1420,7 @@ CTAGS:
ifndef DISABLE_AUTO_DEPENDENCIES ifndef DISABLE_AUTO_DEPENDENCIES
# If its not one of the cleaning targets # If its not one of the cleaning targets
ifneq ($(strip($(filter-out clean clean-local dist-clean,$(MAKECMDGOALS)))),) ifneq ($(strip $(filter-out clean clean-local dist-clean,$(MAKECMDGOALS)))),)
# Get the list of dependency files # Get the list of dependency files
DependFiles := $(basename $(filter %.cpp %.c %.cc, $(Sources))) DependFiles := $(basename $(filter %.cpp %.c %.cc, $(Sources)))