diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-10 14:01:50 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-10 14:01:50 +0000 |
| commit | 482b9c2ce7837af5071ba38db0874046020a10db (patch) | |
| tree | 24e5e71835ccb2b9451e9ac21abe7206f55f46f0 /lib/mkmf.rb | |
| parent | 53157197d2fc18b2fcef62df05c2fca8707cd979 (diff) | |
| download | ruby-482b9c2ce7837af5071ba38db0874046020a10db.tar.gz | |
* configure.in (LIBPATHFLAG, RPATHFLAG): enclose paths with single
quotes. [ruby-dev:22564]
* lib/mkmf.rb (libpathflag): do not enclose with quotes always.
* {bcc32,win32,wince}/Makefile.sub (LIBPATHFLAG): quoted.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5426 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/mkmf.rb')
| -rw-r--r-- | lib/mkmf.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index ab1bea1b59..fb62c271ea 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -249,7 +249,7 @@ end def libpathflag(libpath=$LIBPATH) libpath.map{|x| - (x == "$(topdir)" ? LIBPATHFLAG : LIBPATHFLAG+RPATHFLAG) % %['#{x}'] + (x == "$(topdir)" ? LIBPATHFLAG : LIBPATHFLAG+RPATHFLAG) % x }.join end @@ -1036,7 +1036,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' |