mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-08-09 11:25:55 +00:00
Make built bytecode libraries depend on gccas/gccld as appropriate. This
should fix the stale runtime libraries problem. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@18361 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -201,6 +201,9 @@ endif
|
|||||||
ifndef TBLGEN
|
ifndef TBLGEN
|
||||||
TBLGEN := $(LLVMToolDir)/tblgen$(EXEEXT)
|
TBLGEN := $(LLVMToolDir)/tblgen$(EXEEXT)
|
||||||
endif
|
endif
|
||||||
|
ifndef GCCAS
|
||||||
|
GCCAS := $(LLVMToolDir)/gccas$(EXEEXT)
|
||||||
|
endif
|
||||||
ifndef GCCLD
|
ifndef GCCLD
|
||||||
GCCLD := $(LLVMToolDir)/gccld$(EXEEXT)
|
GCCLD := $(LLVMToolDir)/gccld$(EXEEXT)
|
||||||
endif
|
endif
|
||||||
@@ -520,7 +523,7 @@ endif
|
|||||||
|
|
||||||
all-local:: $(LibName.BC)
|
all-local:: $(LibName.BC)
|
||||||
|
|
||||||
$(LibName.BC): $(BUILT_SOURCES) $(ObjectsBC) $(LibDir)/.dir
|
$(LibName.BC): $(BUILT_SOURCES) $(ObjectsBC) $(LibDir)/.dir $(GCCLD)
|
||||||
$(Echo) Linking $(BuildMode) Bytecode Library $(notdir $@)
|
$(Echo) Linking $(BuildMode) Bytecode Library $(notdir $@)
|
||||||
$(Verb) $(BCLinkLib) -o $@ $(ObjectsBC)
|
$(Verb) $(BCLinkLib) -o $@ $(ObjectsBC)
|
||||||
|
|
||||||
@@ -782,13 +785,13 @@ endif
|
|||||||
#---------------------------------------------------------
|
#---------------------------------------------------------
|
||||||
# Create .bc files in the ObjDir directory from .cpp and .c files...
|
# Create .bc files in the ObjDir directory from .cpp and .c files...
|
||||||
#---------------------------------------------------------
|
#---------------------------------------------------------
|
||||||
$(ObjDir)/%.bc: %.cpp $(ObjDir)/.dir
|
$(ObjDir)/%.bc: %.cpp $(ObjDir)/.dir $(GCCAS)
|
||||||
$(Echo) "Compiling $*.cpp for $(BuildMode) build (bytecode)"
|
$(Echo) "Compiling $*.cpp for $(BuildMode) build (bytecode)"
|
||||||
$(Verb) if $(BCCompile.CXX) -MD -MT $@ -MP -MF "$(ObjDir)/$*.BCCXXd" $< -o $@ ; \
|
$(Verb) if $(BCCompile.CXX) -MD -MT $@ -MP -MF "$(ObjDir)/$*.BCCXXd" $< -o $@ ; \
|
||||||
then $(MV) -f "$(ObjDir)/$*.BCCXXd" "$(ObjDir)/$*.d"; \
|
then $(MV) -f "$(ObjDir)/$*.BCCXXd" "$(ObjDir)/$*.d"; \
|
||||||
else $(RM) -f "$(ObjDir)/$*.BCCXXd"; exit 1; fi
|
else $(RM) -f "$(ObjDir)/$*.BCCXXd"; exit 1; fi
|
||||||
|
|
||||||
$(ObjDir)/%.bc: %.c $(ObjDir)/.dir
|
$(ObjDir)/%.bc: %.c $(ObjDir)/.dir $(GCCAS)
|
||||||
$(Echo) "Compiling $*.c for $(BuildMode) build (bytecode)"
|
$(Echo) "Compiling $*.c for $(BuildMode) build (bytecode)"
|
||||||
$(Verb) if $(BCCompile.C) -MD -MT $@ -MP -MF "$(ObjDir)/$*.BCCd" $< -o $@ ; \
|
$(Verb) if $(BCCompile.C) -MD -MT $@ -MP -MF "$(ObjDir)/$*.BCCd" $< -o $@ ; \
|
||||||
then $(MV) -f "$(ObjDir)/$*.BCCd" "$(ObjDir)/$*.d"; \
|
then $(MV) -f "$(ObjDir)/$*.BCCd" "$(ObjDir)/$*.d"; \
|
||||||
@@ -818,11 +821,11 @@ $(ObjDir)/%.o: %.c $(ObjDir)/.dir
|
|||||||
$(Compile.C) $< -o $@
|
$(Compile.C) $< -o $@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
$(ObjDir)/%.bc: %.cpp $(ObjDir)/.dir
|
$(ObjDir)/%.bc: %.cpp $(ObjDir)/.dir $(GCCAS)
|
||||||
$(Echo) "Compiling $*.cpp for $(BuildMode) build (bytecode)"
|
$(Echo) "Compiling $*.cpp for $(BuildMode) build (bytecode)"
|
||||||
$(BCCompile.CXX) $< -o $@
|
$(BCCompile.CXX) $< -o $@
|
||||||
|
|
||||||
$(ObjDir)/%.bc: %.c $(ObjDir)/.dir
|
$(ObjDir)/%.bc: %.c $(ObjDir)/.dir $(GCCAS)
|
||||||
$(Echo) "Compiling $*.c for $(BuildMode) build (bytecode)"
|
$(Echo) "Compiling $*.c for $(BuildMode) build (bytecode)"
|
||||||
$(BCCompile.C) $< -o $@
|
$(BCCompile.C) $< -o $@
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user