# HG changeset patch # User Laurent Daynes # Date 1350639050 -7200 # Node ID 2b5eab0df11102fd0dcfe2c643c2fd551cc6b438 # Parent d5f7e737827f577e6289b3d0bfa3a7a82f15e2d6 Fixed linking issue on Solaris. Mapfile vers files must be defined. diff -r d5f7e737827f -r 2b5eab0df111 make/solaris/makefiles/debug.make --- a/make/solaris/makefiles/debug.make Fri Oct 19 11:30:06 2012 +0200 +++ b/make/solaris/makefiles/debug.make Fri Oct 19 11:30:50 2012 +0200 @@ -42,6 +42,9 @@ # Linker mapfiles MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers \ $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-debug +#ifdef GRAAL +MAPFILE += $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-graal +#endif # This mapfile is only needed when compiling with dtrace support, # and mustn't be otherwise. diff -r d5f7e737827f -r 2b5eab0df111 make/solaris/makefiles/fastdebug.make --- a/make/solaris/makefiles/fastdebug.make Fri Oct 19 11:30:06 2012 +0200 +++ b/make/solaris/makefiles/fastdebug.make Fri Oct 19 11:30:50 2012 +0200 @@ -113,6 +113,9 @@ # Linker mapfiles MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers \ $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-debug +#ifdef GRAAL +MAPFILE += $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-graal +#endif # This mapfile is only needed when compiling with dtrace support, # and mustn't be otherwise. diff -r d5f7e737827f -r 2b5eab0df111 make/solaris/makefiles/jvmg.make --- a/make/solaris/makefiles/jvmg.make Fri Oct 19 11:30:06 2012 +0200 +++ b/make/solaris/makefiles/jvmg.make Fri Oct 19 11:30:50 2012 +0200 @@ -46,6 +46,9 @@ # Linker mapfiles MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers \ $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-debug +#ifdef GRAAL +MAPFILE += $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-graal +#endif # This mapfile is only needed when compiling with dtrace support, # and mustn't be otherwise. diff -r d5f7e737827f -r 2b5eab0df111 make/solaris/makefiles/optimized.make --- a/make/solaris/makefiles/optimized.make Fri Oct 19 11:30:06 2012 +0200 +++ b/make/solaris/makefiles/optimized.make Fri Oct 19 11:30:50 2012 +0200 @@ -54,6 +54,9 @@ # Linker mapfiles MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers +#ifdef GRAAL +MAPFILE += $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-graal +#endif # This mapfile is only needed when compiling with dtrace support, # and mustn't be otherwise. diff -r d5f7e737827f -r 2b5eab0df111 make/solaris/makefiles/product.make --- a/make/solaris/makefiles/product.make Fri Oct 19 11:30:06 2012 +0200 +++ b/make/solaris/makefiles/product.make Fri Oct 19 11:30:50 2012 +0200 @@ -64,6 +64,9 @@ # Linker mapfiles MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers +ifdef GRAAL +MAPFILE += $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-graal +endif ifndef USE_GCC # This mapfile is only needed when compiling with dtrace support,