From f2ac189e52a1e56236f2bbac684c3c6bfeabbd21 Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Thu, 16 Dec 2004 07:36:08 +0000 Subject: [PATCH] Get rid of extraneous dependencies on $(BUILT_SOURCES) now that we've fixed the bug with BUILT_SOURCES being dependencies of the user targets. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@18980 91177308-0d34-0410-b5e6-96231b3b80d8 --- Makefile.rules | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.rules b/Makefile.rules index ef4c8b0aa81..4908d4543fe 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -548,7 +548,7 @@ ifdef SHARED_LIBRARY all-local:: $(LibName.LA) -$(LibName.LA): $(BUILT_SOURCES) $(ObjectsLO) $(LibDir)/.dir +$(LibName.LA): $(ObjectsLO) $(LibDir)/.dir $(Echo) Linking $(BuildMode) Shared Library $(LIBRARYNAME)$(SHLIBEXT) $(Verb) $(Link) -o $@ $(ObjectsLO) $(Verb) $(LTInstall) $@ $(LibDir) @@ -591,7 +591,7 @@ ifdef EXPORTED_SYMBOL_FILE BCLinkLib = $(LLVMGCC) -shared -nostdlib -Xlinker \ -internalize-public-api-file=$(EXPORTED_SYMBOL_FILE) -$(LibName.BCA): $(BUILT_SOURCES) $(ObjectsBC) $(LibDir)/.dir $(GCCLD) \ +$(LibName.BCA): $(ObjectsBC) $(LibDir)/.dir $(GCCLD) \ $(LLVMToolDir)/llvm-ar $(Echo) Building $(BuildMode) Bytecode Archive $(notdir $@) \ "(internalize)" @@ -599,7 +599,7 @@ $(LibName.BCA): $(BUILT_SOURCES) $(ObjectsBC) $(LibDir)/.dir $(GCCLD) \ $(Verb) $(RM) -f $@ $(Verb) $(LArchive) $@ $(ObjDir)/$(LIBRARYNAME).o else -$(LibName.BCA): $(BUILT_SOURCES) $(ObjectsBC) $(LibDir)/.dir \ +$(LibName.BCA): $(ObjectsBC) $(LibDir)/.dir \ $(LLVMToolDir)/llvm-ar $(Echo) Building $(BuildMode) Bytecode Archive $(notdir $@) $(Verb) $(RM) -f $@ @@ -643,7 +643,7 @@ ifndef DONT_BUILD_RELINKED all-local:: $(LibName.O) -$(LibName.O): $(BUILT_SOURCES) $(ObjectsO) $(LibDir)/.dir +$(LibName.O): $(ObjectsO) $(LibDir)/.dir $(Echo) Linking $(BuildMode) Object Library $(notdir $@) $(Verb) $(Relink) -o $@ $(ObjectsO) @@ -675,7 +675,7 @@ ifdef BUILD_ARCHIVE all-local:: $(LibName.A) -$(LibName.A): $(BUILT_SOURCES) $(ObjectsO) $(LibDir)/.dir +$(LibName.A): $(ObjectsO) $(LibDir)/.dir $(Echo) Building $(BuildMode) Archive Library $(notdir $@) -$(Verb) $(RM) -f $@ $(Verb) $(Archive) $@ $(ObjectsO) @@ -807,7 +807,7 @@ else $(ToolBuildPath): $(ToolDir)/.dir endif -$(ToolBuildPath): $(BUILT_SOURCES) $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) +$(ToolBuildPath): $(ObjectsO) $(ProjLibsPaths) $(LLVMLibsPaths) $(Echo) Linking $(BuildMode) executable $(TOOLNAME) $(StripWarnMsg) $(Verb) $(Link) -o $@ $(TOOLLINKOPTS) $(ObjectsO) $(ProjLibsOptions) \ $(LLVMLibsOptions) $(ExtraLibs) $(TOOLLINKOPTSB)