summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-06-28 05:58:13 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-06-28 05:58:13 +0000
commitef8300344f7829947d8086d1c14dbc06672d1d73 (patch)
tree0a5f2c70345353a3fe22fa5253131f319be16473
parent0e4fb2c0671440ed30f7896eb85c316d073247e6 (diff)
downloadruby-ef8300344f7829947d8086d1c14dbc06672d1d73.tar.gz
ruby-ef8300344f7829947d8086d1c14dbc06672d1d73.tar.xz
ruby-ef8300344f7829947d8086d1c14dbc06672d1d73.zip
* configure.in, lib/mkmf.rb (LIBPATHFLAG): use double quotes due to
DOSISH compilers. [ruby-core:03107] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6538 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--configure.in2
-rw-r--r--lib/mkmf.rb2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 83e66666c..2530b5c88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 28 14:57:56 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in, lib/mkmf.rb (LIBPATHFLAG): use double quotes due to
+ DOSISH compilers. [ruby-core:03107]
+
Mon Jun 28 00:30:19 2004 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* sample/drb/*.rb: using 'DRb.thread.join' instead of 'gets'
diff --git a/configure.in b/configure.in
index 07c9e82bd..ea2f82cf8 100644
--- a/configure.in
+++ b/configure.in
@@ -804,7 +804,7 @@ AC_SUBST(DLEXT2)dnl
AC_SUBST(LIBEXT)dnl
STATIC=
-: ${LIBPATHFLAG=" -L'%s'"}
+: ${LIBPATHFLAG=' -L"%s"'}
: ${PATHFLAG=''}
if test "$with_dln_a_out" != yes; then
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 490836238..c8640f55c 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1037,7 +1037,7 @@ LINK_SO = config_string('LINK_SO') ||
"$(LDSHARED) $(DLDFLAGS) $(LIBPATH) #{OUTFLAG}$(DLLIB) " \
"$(OBJS) $(LOCAL_LIBS) $(LIBS)"
end
-LIBPATHFLAG = config_string('LIBPATHFLAG') || " -L'%s'"
+LIBPATHFLAG = config_string('LIBPATHFLAG') || ' -L"%s"'
RPATHFLAG = config_string('RPATHFLAG') || ''
LIBARG = config_string('LIBARG') || '-l%s'