OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

Fix automatic dependence on static libs 

llvm-svn: 513
This commit is contained in:
Chris Lattner 2001-09-09 20:59:28 +00:00
parent b606fcb3e0
commit d196e04234
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
llvm/Makefile.common
View File

@ -155,7 +155,7 @@ USED_LIBS_OPTIONS = $(addprefix -l, $(USEDLIBS))
# USED_LIB_PATHS - Compute the path of the libraries used so that tools are
# 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_O = $(addprefix $(LEVEL)/lib/Release/lib, $(STATICUSEDLIBS))
@ -163,10 +163,10 @@ all:: $(TOOLEXENAMES)
clean::
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)
$(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)
endif

6
llvm/Makefile.rules
View File

@ -155,7 +155,7 @@ USED_LIBS_OPTIONS = $(addprefix -l, $(USEDLIBS))
# USED_LIB_PATHS - Compute the path of the libraries used so that tools are
# 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_O = $(addprefix $(LEVEL)/lib/Release/lib, $(STATICUSEDLIBS))
@ -163,10 +163,10 @@ all:: $(TOOLEXENAMES)
clean::
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)
$(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)
endif