summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-08-11 08:21:39 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-08-11 08:21:39 +0000
commitbef1748ddef68e8276be1492cf8e33a7544fd197 (patch)
tree23a90ada79eff4daaafcc5144972c320359aa88a
parent27ff939a566591711177524d172e8b09b24ba9cf (diff)
downloadruby-bef1748ddef68e8276be1492cf8e33a7544fd197.tar.gz
ruby-bef1748ddef68e8276be1492cf8e33a7544fd197.tar.xz
ruby-bef1748ddef68e8276be1492cf8e33a7544fd197.zip
* configure.in (RPATHFLAG): stop setting RPATHFLAG on Interix.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6754 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--configure.in3
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 619df7a51..ebfdd8177 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Aug 11 17:17:50 2004 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * configure.in (RPATHFLAG): stop setting RPATHFLAG on Interix.
+
Sun Aug 8 00:43:31 2004 why the lucky stiff <why@ruby-lang.org>
* lib/implicit.c: added sexagecimal float#base60.
diff --git a/configure.in b/configure.in
index ea2f82cf8..84f8e608f 100644
--- a/configure.in
+++ b/configure.in
@@ -861,7 +861,6 @@ if test "$with_dln_a_out" != yes; then
interix*) : ${LDSHARED="$CC -shared"}
XLDFLAGS="$XLDFLAGS -Wl,-E"
LIBPATHFLAG=" -L'%1\$-s'"
- RPATHFLAG=" -Wl,-R'%1\$-s'"
rb_cv_dlopen=yes ;;
gnu*) : ${LDSHARED="$CC -shared"}
rb_cv_dlopen=yes
@@ -1225,7 +1224,7 @@ if test "$enable_shared" = 'yes'; then
LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
;;
interix*)
- LIBRUBYARG_SHARED='-Wl,-R -Wl,${libdir} -L${libdir} -L. -l$(RUBY_SO_NAME)'
+ LIBRUBYARG_SHARED='-L${libdir} -L. -l$(RUBY_SO_NAME)'
;;
*)
;;