summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-11-08 03:19:14 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-11-08 03:19:14 +0000
commit294070d86a0d3f2d9afdc539a3ad45ac0bb1493c (patch)
treebe564d2406c7f177777d239900c6057cb092a611
parent7dd7ce0ff74bae43ff2859215899c15349ac03cf (diff)
* configure.in: support -h for solaris linker when gcc not used
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29716 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--configure.in2
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 75c2082905..0e2a1b5ad9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Nov 8 12:16:39 2010 Ben Walton <bwalton@artsci.utoronto.ca>
+
+ * configure.in: support -h for solaris linker when gcc not used
+
Mon Nov 8 11:47:39 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (finish_overlapped_socket): refactoring.
diff --git a/configure.in b/configure.in
index 696721dfbe..dc8cb7cf39 100644
--- a/configure.in
+++ b/configure.in
@@ -2242,6 +2242,8 @@ AS_CASE("$enable_shared", [yes], [
LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY) lib$(RUBY_SO_NAME).so'
if test "$GCC" = yes; then
LIBRUBY_DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(@F)'
+ else
+ LIBRUBY_DLDFLAGS="$DLDFLAGS "'-h $(@F)'
fi
XLDFLAGS="$XLDFLAGS "'-R${libdir}'
],