Mercurial > hg > truffle
changeset 6704:4d6c13994690
Fixed use of mapfilevers for solaris makefile.
| author | Laurent Daynes <Laurent.Daynes@oracle.com> |
|---|---|
| date | Mon, 12 Nov 2012 13:02:43 +0100 |
| parents | 04ab1ba96ce2 |
| children | 0cb1ac637dd0 |
| files | make/solaris/makefiles/debug.make make/solaris/makefiles/fastdebug.make make/solaris/makefiles/jvmg.make make/solaris/makefiles/optimized.make make/solaris/makefiles/product.make make/solaris/makefiles/vm.make |
| diffstat | 6 files changed, 2 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/make/solaris/makefiles/debug.make Mon Nov 12 11:48:01 2012 +0100 +++ b/make/solaris/makefiles/debug.make Mon Nov 12 13:02:43 2012 +0100 @@ -42,9 +42,6 @@ # 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.
--- a/make/solaris/makefiles/fastdebug.make Mon Nov 12 11:48:01 2012 +0100 +++ b/make/solaris/makefiles/fastdebug.make Mon Nov 12 13:02:43 2012 +0100 @@ -113,9 +113,6 @@ # 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.
--- a/make/solaris/makefiles/jvmg.make Mon Nov 12 11:48:01 2012 +0100 +++ b/make/solaris/makefiles/jvmg.make Mon Nov 12 13:02:43 2012 +0100 @@ -46,9 +46,6 @@ # 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.
--- a/make/solaris/makefiles/optimized.make Mon Nov 12 11:48:01 2012 +0100 +++ b/make/solaris/makefiles/optimized.make Mon Nov 12 13:02:43 2012 +0100 @@ -54,9 +54,6 @@ # 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.
--- a/make/solaris/makefiles/product.make Mon Nov 12 11:48:01 2012 +0100 +++ b/make/solaris/makefiles/product.make Mon Nov 12 13:02:43 2012 +0100 @@ -64,9 +64,6 @@ # 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,
--- a/make/solaris/makefiles/vm.make Mon Nov 12 11:48:01 2012 +0100 +++ b/make/solaris/makefiles/vm.make Mon Nov 12 13:02:43 2012 +0100 @@ -338,11 +338,11 @@ install_jvm: $(LIBJVM) @echo "Copying $(LIBJVM) to $(DEST_JVM)" - $(QUIETLY) test -f $(LIBJVM_DEBUGINFO) && \ + -$(QUIETLY) test -f $(LIBJVM_DEBUGINFO) && \ cp -f $(LIBJVM_DEBUGINFO) $(DEST_JVM_DEBUGINFO) -$(QUIETLY) test -f $(LIBJVM_DIZ) && \ cp -f $(LIBJVM_DIZ) $(DEST_JVM_DIZ) - -$(QUIETLY) cp -f $(LIBJVM) $(DEST_JVM) && echo "Done" + $(QUIETLY) cp -f $(LIBJVM) $(DEST_JVM) && echo "Done" #---------------------------------------------------------------------- # Other files