[vmkit-commits] [vmkit] r144137 - /vmkit/trunk/Makefile.rules

[Nicolas Geoffray]

Hi Gael,

On Tue, Nov 8, 2011 at 11:16 PM, Gael Thomas <gael.thomas at lip6.fr> wrote:

> Author: gthomas
> Date: Tue Nov  8 16:16:09 2011
> New Revision: 144137
>
> URL: http://llvm.org/viewvc/llvm-project?rev=144137&view=rev
> Log:
> generate object with gc by using relative names
>
> Modified:
>    vmkit/trunk/Makefile.rules
>
> Modified: vmkit/trunk/Makefile.rules
> URL:
> http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.rules?rev=144137&r1=144136&r2=144137&view=diff
>
> ==============================================================================
> --- vmkit/trunk/Makefile.rules (original)
> +++ vmkit/trunk/Makefile.rules Tue Nov  8 16:16:09 2011
> @@ -104,11 +104,11 @@
>
>  $(ObjectsBCWithGC): $(ObjDir)/%_gc.bc: $(ObjDir)/%.ll $(LOPT)
>        $(Echo) "Compiling $*.ll to $*.bc for $(BuildMode) build (bytecode)"
> -       $(Verb) $(LOPT) $< -load=$(LibDir)/StaticGCPass$(SHLIBEXT)
> -std-compile-opts -StaticGCPass -o $@
> +       $(Verb) $(LOPT) $<
> -load=$(VMKIT_SRC_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=$(LibDir)/StaticGCPrinter$(SHLIBEXT) $< -o $@
> +       $(Verb) $(LLC) -disable-cfi -disable-fp-elim
> -load=$(VMKIT_SRC_ROOT)/$(BuildMode)/lib/StaticGCPrinter$(SHLIBEXT) $< -o $@
>
>
This does not work if you build vmkit in another directory than the source
directory. Can you have a fix for handling both 'modes' (building in
source, building outside)? Otherwise, I'll revert the change.


>  $(ObjectsWithGC): $(ObjDir)/%_gc.o: $(ObjDir)/%_gc.s $(ObjDir)/.dir
>        $(Echo) "Compiling $*.s for $(BuildMode) build" $(PIC_FLAG)
>
>
> _______________________________________________
> vmkit-commits mailing list
> vmkit-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/vmkit-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/vmkit-commits/attachments/20111108/3d01a502/attachment.html>