[vmkit-commits] [vmkit] r144181 - in /vmkit/trunk: Makefile.config.in Makefile.rules

[Gael Thomas]

Author: gthomas
Date: Wed Nov  9 05:12:43 2011
New Revision: 144181

URL: http://llvm.org/viewvc/llvm-project?rev=144181&view=rev
Log:
Can build from another directoy. I'm unable to build from another directory, but it is not related to my previous modification :)

Modified:
    vmkit/trunk/Makefile.config.in
    vmkit/trunk/Makefile.rules

Modified: vmkit/trunk/Makefile.config.in
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.config.in?rev=144181&r1=144180&r2=144181&view=diff
==============================================================================
--- vmkit/trunk/Makefile.config.in (original)
+++ vmkit/trunk/Makefile.config.in Wed Nov  9 05:12:43 2011
@@ -7,7 +7,8 @@
 VMKIT_SRC_ROOT := $(PROJ_SRC_ROOT)
 
 # Set the root directory of this project's object files
-PROJ_OBJ_ROOT := $(subst //,/, at abs_top_objdir@)
+PROJ_OBJ_ROOT := $(subst //,/, at abs_top_builddir@)
+VMKIT_OBJ_ROOT := $(PROJ_OBJ_ROOT)
 
 # Set the root directory of this project's install prefix
 PROJ_INSTALL_ROOT := @prefix@

Modified: vmkit/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.rules?rev=144181&r1=144180&r2=144181&view=diff
==============================================================================
--- vmkit/trunk/Makefile.rules (original)
+++ vmkit/trunk/Makefile.rules Wed Nov  9 05:12:43 2011
@@ -104,11 +104,11 @@
 
 $(ObjectsBCWithGC): $(ObjDir)/%_gc.bc: $(ObjDir)/%.ll $(LOPT)
 	$(Echo) "Compiling $*.ll to $*.bc for $(BuildMode) build (bytecode)"
-	$(Verb) $(LOPT) $< -load=$(VMKIT_SRC_ROOT)/$(BuildMode)/lib/StaticGCPass$(SHLIBEXT) -std-compile-opts -StaticGCPass -o $@
+	$(Verb) $(LOPT) $< -load=$(VMKIT_OBJ_ROOT)/$(BuildMode)/lib/StaticGCPass$(SHLIBEXT) -std-compile-opts -StaticGCPass -o $@
 
 $(ObjectsSWithGC): $(ObjDir)/%_gc.s: $(ObjDir)/%_gc.bc $(LLC)
 	$(Echo) "Compiling $*.bc to $*.s for $(BuildMode) build"
-	$(Verb) $(LLC) -disable-cfi -disable-fp-elim -load=$(VMKIT_SRC_ROOT)/$(BuildMode)/lib/StaticGCPrinter$(SHLIBEXT) $< -o $@
+	$(Verb) $(LLC) -disable-cfi -disable-fp-elim -load=$(VMKIT_OBJ_ROOT)/$(BuildMode)/lib/StaticGCPrinter$(SHLIBEXT) $< -o $@
 
 $(ObjectsWithGC): $(ObjDir)/%_gc.o: $(ObjDir)/%_gc.s $(ObjDir)/.dir
 	$(Echo) "Compiling $*.s for $(BuildMode) build" $(PIC_FLAG)