aboutsummaryrefslogtreecommitdiffstats
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
commit39516ae717ee95963e003425e059b6a7049ee390 (patch)
tree7ea299b828ede61ed0ac2d450447a9f7fe2fc564
parent1a79a3139a0ef0f693d4807c42f201ffa8a74cf6 (diff)
downloadruby-39516ae717ee95963e003425e059b6a7049ee390.tar.gz
* configure.in (RPATHFLAG): stop setting RPATHFLAG on Interix.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@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 b46bc65469..3293cfa1c8 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.
+
Mon Aug 9 15:03:20 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/webrick/httpservlet/erbhandler.rb
diff --git a/configure.in b/configure.in
index 79dde00a87..e63195319d 100644
--- a/configure.in
+++ b/configure.in
@@ -878,7 +878,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
@@ -1248,7 +1247,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)'
;;
*)
;;