[vmkit-commits] [vmkit] r180386 - remove useless linking of o files into an o file

[Peter Senna Tschudin]

Author: peter.senna
Date: Thu Apr 25 12:04:10 2013
New Revision: 180386

URL: http://llvm.org/viewvc/llvm-project?rev=180386&view=rev
Log:
remove useless linking of o files into an o file
(cherry picked from commit a14999ba21fa1449214881324a241f46e90a33dd)

Modified:
    vmkit/trunk/Makefile.rules

Modified: vmkit/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.rules?rev=180386&r1=180385&r2=180386&view=diff
==============================================================================
--- vmkit/trunk/Makefile.rules (original)
+++ vmkit/trunk/Makefile.rules Thu Apr 25 12:04:10 2013
@@ -68,7 +68,7 @@ LArchive=$(LLVM_BIN)/llvm-ar rcsf
 ###############################################################################
 #   Linking options
 ###############################################################################
-USEDLIBS:=$(addprefix $(LibDir)/lib,$(patsubst %.a,%.a,$(USEDLIBS)))
+USEDLIBS:=$(patsubst %,$(LibDir)/lib%,$(USEDLIBS))
 
 #
 #
@@ -148,7 +148,6 @@ ifdef MODULE_WITH_GC
 ObjectsBCWithGC   := $(BaseNameSources:%=$(ObjDir)/%_gc.bc)
 ObjectsWithGC     := $(BaseNameSources:%=$(ObjDir)/%_gc.o)
 AModule           := $(LibDir)/lib$(MODULE_WITH_GC).a
-OModule           := $(LibDir)/$(MODULE_WITH_GC).o
 
 $(ObjectsBCWithGC): $(ObjDir)/%_gc.bc: $(ObjDir)/%.bc $(LOPT)
 	$(Echo) "**[4] Compiling $*.bc to $*.bc (gc) for $(BuildMode) build (bytecode)" # $(OPT_BC_WITH_GC_FLAGS)
@@ -164,11 +163,7 @@ $(AModule): $(ObjectsWithGC) $(LibDir)/.
 	$(Verb) $(Archive) $@ $(ObjectsWithGC)
 	$(Verb) $(Ranlib) $@
 
-$(OModule): $(ObjectsWithGC) $(LibDir)/.dir
-	$(Echo) "**[80] Linking native module $(notdir $@)"
-	$(Verb) $(LD) -r $(ObjectsWithGC) -o $@
-
-all-local:: $(OModule) $(AModule)
+all-local:: $(AModule)
 
 clean-local::
 	-$(Verb) $(RM) -f $(AModule) $(ObjectsBCWithGC) $(ObjectsSWithGC) $(ObjectsWithGC)