Mercurial > hg > truffle
comparison make/bsd/makefiles/vm.make @ 6813:5c8fbbfed964
Merge
author | stefank |
---|---|
date | Mon, 01 Oct 2012 11:07:31 +0200 |
parents | 37518f191ddb |
children | fb19af007ffc |
comparison
equal
deleted
inserted
replaced
6812:988bf00cc564 | 6813:5c8fbbfed964 |
---|---|
309 $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT) | 309 $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT) |
310 $(QUIETLY) { \ | 310 $(QUIETLY) { \ |
311 echo Linking vm...; \ | 311 echo Linking vm...; \ |
312 $(LINK_LIB.CXX/PRE_HOOK) \ | 312 $(LINK_LIB.CXX/PRE_HOOK) \ |
313 $(LINK_VM) $(LD_SCRIPT_FLAG) \ | 313 $(LINK_VM) $(LD_SCRIPT_FLAG) \ |
314 $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM); \ | 314 $(LFLAGS_VM) -o $@ $(sort $(LIBJVM.o)) $(LIBS_VM); \ |
315 $(LINK_LIB.CXX/POST_HOOK) \ | 315 $(LINK_LIB.CXX/POST_HOOK) \ |
316 rm -f $@.1; ln -s $@ $@.1; \ | 316 rm -f $@.1; ln -s $@ $@.1; \ |
317 [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \ | 317 [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \ |
318 } | 318 } |
319 | 319 |