Mercurial > hg > truffle

diff make/bsd/makefiles/vm.make @ 6813:5c8fbbfed964

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author stefank
date Mon, 01 Oct 2012 11:07:31 +0200
parents 37518f191ddb
children fb19af007ffc
line wrap: on
line diff
--- a/make/bsd/makefiles/vm.make	Thu Sep 27 15:44:01 2012 -0700
+++ b/make/bsd/makefiles/vm.make	Mon Oct 01 11:07:31 2012 +0200
@@ -311,7 +311,7 @@
 	    echo Linking vm...;                                         \
 	    $(LINK_LIB.CXX/PRE_HOOK)                                     \
 	    $(LINK_VM) $(LD_SCRIPT_FLAG)                                \
-		       $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM);       \
+		       $(LFLAGS_VM) -o $@ $(sort $(LIBJVM.o)) $(LIBS_VM); \
 	    $(LINK_LIB.CXX/POST_HOOK)                                    \
 	    rm -f $@.1; ln -s $@ $@.1;                                  \
 	    [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \