# HG changeset patch # User stefank # Date 1291316507 -3600 # Node ID 2968675b413e58793940371557cc534a61e603bd # Parent c760f78e0a533fdaee3d555414df715727d5c5d2 7003786: sort Obj_Files before compiling Summary: Reverted to old sort order on Linux and Solaris. Reviewed-by: tonyp, coleenp diff -r c760f78e0a53 -r 2968675b413e make/linux/makefiles/vm.make --- a/make/linux/makefiles/vm.make Wed Dec 01 15:04:06 2010 +0100 +++ b/make/linux/makefiles/vm.make Thu Dec 02 20:01:47 2010 +0100 @@ -173,7 +173,7 @@ Src_Files := $(foreach e,$(Src_Dirs),$(call findsrc,$(e))) -Obj_Files = $(addsuffix .o,$(basename $(Src_Files))) +Obj_Files = $(sort $(addsuffix .o,$(basename $(Src_Files)))) JVM_OBJ_FILES = $(Obj_Files) diff -r c760f78e0a53 -r 2968675b413e make/solaris/makefiles/vm.make --- a/make/solaris/makefiles/vm.make Wed Dec 01 15:04:06 2010 +0100 +++ b/make/solaris/makefiles/vm.make Thu Dec 02 20:01:47 2010 +0100 @@ -189,7 +189,7 @@ Src_Files := $(foreach e,$(Src_Dirs),$(call findsrc,$(e))) -Obj_Files = $(addsuffix .o,$(basename $(Src_Files))) +Obj_Files = $(sort $(addsuffix .o,$(basename $(Src_Files)))) JVM_OBJ_FILES = $(Obj_Files) $(DTRACE_OBJS)