mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-12-13 04:30:23 +00:00
Fix automatic dependence on static libs
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@513 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
9856e0c56b
commit
bf2f043659
@ -155,7 +155,7 @@ USED_LIBS_OPTIONS = $(addprefix -l, $(USEDLIBS))
|
|||||||
# USED_LIB_PATHS - Compute the path of the libraries used so that tools are
|
# USED_LIB_PATHS - Compute the path of the libraries used so that tools are
|
||||||
# rebuilt if libraries change
|
# rebuilt if libraries change
|
||||||
#
|
#
|
||||||
STATICUSEDLIBS = $(addsuffix .a, $(USEDLIBS)
|
STATICUSEDLIBS = $(addsuffix .a, $(USEDLIBS))
|
||||||
USED_LIB_PATHS_G = $(addprefix $(LEVEL)/lib/Debug/lib, $(STATICUSEDLIBS))
|
USED_LIB_PATHS_G = $(addprefix $(LEVEL)/lib/Debug/lib, $(STATICUSEDLIBS))
|
||||||
USED_LIB_PATHS_O = $(addprefix $(LEVEL)/lib/Release/lib, $(STATICUSEDLIBS))
|
USED_LIB_PATHS_O = $(addprefix $(LEVEL)/lib/Release/lib, $(STATICUSEDLIBS))
|
||||||
|
|
||||||
@ -163,10 +163,10 @@ all:: $(TOOLEXENAMES)
|
|||||||
clean::
|
clean::
|
||||||
rm -f $(TOOLEXENAMES)
|
rm -f $(TOOLEXENAMES)
|
||||||
|
|
||||||
$(TOOLEXENAME_G): $(ObjectsG) $(USED_LIBS_PATHS_G) $(LEVEL)/tools/Debug/.dir
|
$(TOOLEXENAME_G): $(ObjectsG) $(USED_LIB_PATHS_G) $(LEVEL)/tools/Debug/.dir
|
||||||
$(LinkG) -o $@ $(ObjectsG) $(USED_LIBS_OPTIONS)
|
$(LinkG) -o $@ $(ObjectsG) $(USED_LIBS_OPTIONS)
|
||||||
|
|
||||||
$(TOOLEXENAME_O): $(ObjectsO) $(USED_LIBS_PATHS_O) $(LEVEL)/tools/Release/.dir
|
$(TOOLEXENAME_O): $(ObjectsO) $(USED_LIB_PATHS_O) $(LEVEL)/tools/Release/.dir
|
||||||
$(LinkO) -o $@ $(ObjectsG) $(USED_LIBS_OPTIONS)
|
$(LinkO) -o $@ $(ObjectsG) $(USED_LIBS_OPTIONS)
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
@ -155,7 +155,7 @@ USED_LIBS_OPTIONS = $(addprefix -l, $(USEDLIBS))
|
|||||||
# USED_LIB_PATHS - Compute the path of the libraries used so that tools are
|
# USED_LIB_PATHS - Compute the path of the libraries used so that tools are
|
||||||
# rebuilt if libraries change
|
# rebuilt if libraries change
|
||||||
#
|
#
|
||||||
STATICUSEDLIBS = $(addsuffix .a, $(USEDLIBS)
|
STATICUSEDLIBS = $(addsuffix .a, $(USEDLIBS))
|
||||||
USED_LIB_PATHS_G = $(addprefix $(LEVEL)/lib/Debug/lib, $(STATICUSEDLIBS))
|
USED_LIB_PATHS_G = $(addprefix $(LEVEL)/lib/Debug/lib, $(STATICUSEDLIBS))
|
||||||
USED_LIB_PATHS_O = $(addprefix $(LEVEL)/lib/Release/lib, $(STATICUSEDLIBS))
|
USED_LIB_PATHS_O = $(addprefix $(LEVEL)/lib/Release/lib, $(STATICUSEDLIBS))
|
||||||
|
|
||||||
@ -163,10 +163,10 @@ all:: $(TOOLEXENAMES)
|
|||||||
clean::
|
clean::
|
||||||
rm -f $(TOOLEXENAMES)
|
rm -f $(TOOLEXENAMES)
|
||||||
|
|
||||||
$(TOOLEXENAME_G): $(ObjectsG) $(USED_LIBS_PATHS_G) $(LEVEL)/tools/Debug/.dir
|
$(TOOLEXENAME_G): $(ObjectsG) $(USED_LIB_PATHS_G) $(LEVEL)/tools/Debug/.dir
|
||||||
$(LinkG) -o $@ $(ObjectsG) $(USED_LIBS_OPTIONS)
|
$(LinkG) -o $@ $(ObjectsG) $(USED_LIBS_OPTIONS)
|
||||||
|
|
||||||
$(TOOLEXENAME_O): $(ObjectsO) $(USED_LIBS_PATHS_O) $(LEVEL)/tools/Release/.dir
|
$(TOOLEXENAME_O): $(ObjectsO) $(USED_LIB_PATHS_O) $(LEVEL)/tools/Release/.dir
|
||||||
$(LinkO) -o $@ $(ObjectsG) $(USED_LIBS_OPTIONS)
|
$(LinkO) -o $@ $(ObjectsG) $(USED_LIBS_OPTIONS)
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
Loading…
Reference in New Issue
Block a user