Mercurial > hg > truffle
diff make/solaris/makefiles/launcher.make @ 7066:7d815d842ee0
Merge.
| author | Christian Haeubl <haeubl@ssw.jku.at> |
|---|---|
| date | Fri, 23 Nov 2012 11:50:27 +0100 |
| parents | 37518f191ddb |
| children |
line wrap: on
line diff
--- a/make/solaris/makefiles/launcher.make Fri Nov 23 11:40:17 2012 +0100 +++ b/make/solaris/makefiles/launcher.make Fri Nov 23 11:50:27 2012 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -43,7 +43,7 @@ ifeq ($(LINK_INTO),AOUT) LAUNCHER.o = launcher.o $(JVM_OBJ_FILES) - LAUNCHER_MAPFILE = mapfile_reorder + LAUNCHER_MAPFILE = mapfile_extended LFLAGS_LAUNCHER$(LDNOMAP) += $(MAPFLAG:FILENAME=$(LAUNCHER_MAPFILE)) LIBS_LAUNCHER += $(LIBS) else @@ -96,7 +96,7 @@ ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),) $(QUIETLY) echo Linking launcher... $(QUIETLY) $(LINK_LAUNCHER/PRE_HOOK) - $(QUIETLY) $(LINK_LAUNCHER) $(LFLAGS_LAUNCHER) -o $@ $(OBJS) $(LIBS_LAUNCHER) + $(QUIETLY) $(LINK_LAUNCHER) $(LFLAGS_LAUNCHER) -o $@ $(sort $(OBJS)) $(LIBS_LAUNCHER) $(QUIETLY) $(LINK_LAUNCHER/POST_HOOK) endif # filter -sbfast -xsbfast