changeset 1984:2968675b413e

7003786: sort Obj_Files before compiling Summary: Reverted to old sort order on Linux and Solaris. Reviewed-by: tonyp, coleenp
author stefank
date Thu, 02 Dec 2010 20:01:47 +0100
parents c760f78e0a53
children cb2d0a362639
files make/linux/makefiles/vm.make make/solaris/makefiles/vm.make
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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)
 
--- 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)