summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-01-31 15:20:59 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-01-31 15:20:59 +0000
commit5dcfb629b96b7596bfeecc73698e32e7a6b3efab (patch)
tree576fa77e308a463f785853d09d605712b2e404cf
parent2af3ad7bc1364b0242db8b1ce8c52d90716ef369 (diff)
downloadruby-5dcfb629b96b7596bfeecc73698e32e7a6b3efab.tar.gz
ruby-5dcfb629b96b7596bfeecc73698e32e7a6b3efab.tar.xz
ruby-5dcfb629b96b7596bfeecc73698e32e7a6b3efab.zip
* configure.in (aix): fix linker flags on AIX. [ruby-talk:125460]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7857 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--configure.in7
2 files changed, 6 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 142752223..c72c13902 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Tue Feb 1 00:19:13 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Feb 1 00:20:23 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* Makefile.in, configure.in: made EXTOUT configurable.
@@ -6,6 +6,8 @@ Tue Feb 1 00:19:13 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb: make extensions in depth order. [ruby-dev:25522]
+ * configure.in (aix): fix linker flags on AIX. [ruby-talk:125460]
+
Mon Jan 31 13:16:39 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/extconf.rb: add tkutil configuration step (remove old schema)
diff --git a/configure.in b/configure.in
index 1560323f5..ee5954c86 100644
--- a/configure.in
+++ b/configure.in
@@ -880,11 +880,10 @@ if test "$with_dln_a_out" != yes; then
rb_cv_dlopen=yes ;;
aix*) : ${LDSHARED='/usr/ccs/bin/ld'}
XLDFLAGS="$XLDFLAGS -Wl,-bE:ruby.imp"
- DLDFLAGS='-brtl -bI:$(topdir)/ruby.imp -bM:SRE -T512 -H512 '"$DLDFLAGS"
- ARCH_FLAG='-eInit_$(TARGET)'
- : LDFLAGS="-brtl $LDFLAGS"
+ DLDFLAGS='-brtl -eInit_$(TARGET) -bI:$(topdir)/ruby.imp -bM:SRE -T512 -H512 '"$DLDFLAGS"
+ LDFLAGS="-brtl $LDFLAGS"
: ${ARCHFILE="ruby.imp"}
- TRY_LINK='$(CC) $(DLDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS) $(CFLAGS)'
+ TRY_LINK='$(CC) $(LDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS) $(CFLAGS)'
TRY_LINK="$TRY_LINK"' $(src) $(LIBPATH) $(LOCAL_LIBS) $(LIBS)'
: ${LIBPATHENV=SHLIB_PATH}
rb_cv_dlopen=yes ;;