From a0bf3b3bb98c04ca25c8b3bf670b2d4edc52e81a Mon Sep 17 00:00:00 2001 From: eban Date: Fri, 25 Jan 2002 09:00:50 +0000 Subject: [PATCH] * configure.in (solaris): add '-shared' only for GNU ld. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ configure.in | 7 +++++-- version.h | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3d2bd73453..59bd4edab1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Jan 25 17:48:43 2002 WATANABE Hirofumi + + * configure.in (solaris): add '-shared' only for GNU ld. + Fri Jan 25 17:16:23 2002 Yukihiro Matsumoto * class.c (rb_include_module): detect cyclic module inclusion. diff --git a/configure.in b/configure.in index 4a0af908e6..f7cc86dfca 100644 --- a/configure.in +++ b/configure.in @@ -586,8 +586,11 @@ if test "$with_dln_a_out" != yes; then LDFLAGS="-Wl,-E" rb_cv_dlopen=yes;; solaris*) if test "$GCC" = yes; then - LDSHARED='$(CC) -Wl,-G -shared' - `$CC --print-prog-name=ld` -v 2>&1 | grep "GNU ld" > /dev/null && LDFLAGS="-Wl,-E" + LDSHARED='$(CC) -Wl,-G' + if `$CC --print-prog-name=ld` -v 2>&1 | grep "GNU ld" > /dev/null; then + LDFLAGS="-Wl,-E" + LDSHARED="$LDSHARED -shared" + fi else LDSHARED='ld -G' fi diff --git a/version.h b/version.h index 07e6bd6cc5..354c571390 100644 --- a/version.h +++ b/version.h @@ -1,4 +1,4 @@ #define RUBY_VERSION "1.7.2" -#define RUBY_RELEASE_DATE "2002-01-23" +#define RUBY_RELEASE_DATE "2002-01-25" #define RUBY_VERSION_CODE 172 -#define RUBY_RELEASE_CODE 20020123 +#define RUBY_RELEASE_CODE 20020125