Mercurial > hg > truffle
comparison make/solaris/makefiles/vm.make @ 6776:37518f191ddb
7198329: Add $(sort) to object files used in links makes binarties more consistent
Reviewed-by: dholmes, tbell, erikj, ihse, ohrstrom
author | ohair |
---|---|
date | Tue, 18 Sep 2012 13:15:28 -0700 |
parents | da91efe96a93 |
children | e522a00b91aa 892acf0431ef |
comparison
equal
deleted
inserted
replaced
6775:06be7f06c2de | 6776:37518f191ddb |
---|---|
286 # making the library: | 286 # making the library: |
287 $(LIBJVM): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(LIBJVM.o) $(LIBJVM_MAPFILE) | 287 $(LIBJVM): $(ADD_GNU_DEBUGLINK) $(FIX_EMPTY_SEC_HDR_FLAGS) $(LIBJVM.o) $(LIBJVM_MAPFILE) |
288 ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),) | 288 ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),) |
289 @echo Linking vm... | 289 @echo Linking vm... |
290 $(QUIETLY) $(LINK_LIB.CXX/PRE_HOOK) | 290 $(QUIETLY) $(LINK_LIB.CXX/PRE_HOOK) |
291 $(QUIETLY) $(LINK_VM) $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM) | 291 $(QUIETLY) $(LINK_VM) $(LFLAGS_VM) -o $@ $(sort $(LIBJVM.o)) $(LIBS_VM) |
292 $(QUIETLY) $(LINK_LIB.CXX/POST_HOOK) | 292 $(QUIETLY) $(LINK_LIB.CXX/POST_HOOK) |
293 $(QUIETLY) rm -f $@.1 && ln -s $@ $@.1 | 293 $(QUIETLY) rm -f $@.1 && ln -s $@ $@.1 |
294 $(QUIETLY) [ -f $(LIBJVM_G) ] || ln -s $@ $(LIBJVM_G) | 294 $(QUIETLY) [ -f $(LIBJVM_G) ] || ln -s $@ $(LIBJVM_G) |
295 $(QUIETLY) [ -f $(LIBJVM_G).1 ] || ln -s $@.1 $(LIBJVM_G).1 | 295 $(QUIETLY) [ -f $(LIBJVM_G).1 ] || ln -s $@.1 $(LIBJVM_G).1 |
296 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) | 296 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) |