* configure.ac (AM_CONDITIONAL): Added WITH_GNU_LD.

* src/cacao/Makefile.am [WITH_GNU_LD] (libjvm_la_LDFLAGS): Use -M for
the mapfile (Solaris).

diff --git a/configure.ac b/configure.ac
index 0e56e87579f9398d58cb881bb62ab4036a1f1e33..5b0d822d50fd840dff55d95aa7b084ae5f1175cd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -241,6 +241,8 @@ AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AM_PROG_MKDIR_P
 
+AM_CONDITIONAL([WITH_GNU_LD], [test x"$with_gnu_ld" = "xyes"])
+
 dnl Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC

diff --git a/src/cacao/Makefile.am b/src/cacao/Makefile.am
index e4b52adc3c68311299042f65c0aec9dec285a9fa..0f59f3228b95e4d90472c359f992b8cae152cd2a 100644 (file)
--- a/src/cacao/Makefile.am
+++ b/src/cacao/Makefile.am
@@ -38,8 +38,14 @@ libjvm_la_LDFLAGS = \
        -avoid-version
 
 if WITH_JAVA_RUNTIME_LIBRARY_OPENJDK
+if WITH_GNU_LD
 libjvm_la_LDFLAGS += \
        -Xlinker --version-script=$(top_srcdir)/contrib/mapfile-vers-product
+else
+# This is for the Solaris LD.
+libjvm_la_LDFLAGS += \
+       -Xlinker -M$(top_srcdir)/contrib/mapfile-vers-product
+endif
 endif
 
 cacao_LDFLAGS += \