mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/mkmf.rb (libpathflag, find_header, dir_config): quote directory
names if necessary. [ruby-talk:104505] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6524 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
89b572762d
commit
4cf1e8654d
2 changed files with 8 additions and 6 deletions
|
@ -1,8 +1,11 @@
|
|||
Sat Jun 26 11:05:39 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
Sat Jun 26 11:07:20 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* configure.in (aix): -b must come at the start of the command line,
|
||||
and -e must not appear while testing libraries. [ruby-talk:104501]
|
||||
|
||||
* lib/mkmf.rb (libpathflag, find_header, dir_config): quote directory
|
||||
names if necessary. [ruby-talk:104505]
|
||||
|
||||
Sat Jun 26 00:13:08 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* io.c (rb_fopen, rb_fdopen, rb_io_reopen): setvbuf() may return
|
||||
|
|
|
@ -252,7 +252,7 @@ end
|
|||
def libpathflag(libpath=$LIBPATH)
|
||||
libpath.map{|x|
|
||||
(x == "$(topdir)" ? LIBPATHFLAG : LIBPATHFLAG+RPATHFLAG) % x
|
||||
}.join
|
||||
}.quote.join
|
||||
end
|
||||
|
||||
def try_link0(src, opt="", &b)
|
||||
|
@ -541,10 +541,9 @@ def find_header(header, *paths)
|
|||
else
|
||||
found = false
|
||||
paths.each do |dir|
|
||||
opt = "-I#{dir}"
|
||||
opt = "-I#{dir}".quote
|
||||
if try_cpp(cpp_include(header), opt)
|
||||
$INCFLAGS += " "
|
||||
$INCFLAGS += opt
|
||||
$INCFLAGS << " " << opt
|
||||
found = true
|
||||
break
|
||||
end
|
||||
|
@ -682,7 +681,7 @@ def dir_config(target, idefault=nil, ldefault=nil)
|
|||
idirs.collect! {|dir| "-I" + dir}
|
||||
idirs -= Shellwords.shellwords($CPPFLAGS)
|
||||
unless idirs.empty?
|
||||
$CPPFLAGS = (idirs << $CPPFLAGS).join(" ")
|
||||
$CPPFLAGS = (idirs.quote << $CPPFLAGS).join(" ")
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue