kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/mkmf.rb (libpathflag, find_header, dir_config): quote directory

Browse source 
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:
nobu 2004-06-26 02:07:30 +00:00
parent 89b572762d
commit 4cf1e8654d
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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, * configure.in (aix): -b must come at the start of the command line,
and -e must not appear while testing libraries. [ruby-talk:104501] 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> 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 * io.c (rb_fopen, rb_fdopen, rb_io_reopen): setvbuf() may return

9
lib/mkmf.rb
View file

@ -252,7 +252,7 @@ end
def libpathflag(libpath=$LIBPATH) def libpathflag(libpath=$LIBPATH)
libpath.map{|x| libpath.map{|x|
(x == "$(topdir)" ? LIBPATHFLAG : LIBPATHFLAG+RPATHFLAG) % x (x == "$(topdir)" ? LIBPATHFLAG : LIBPATHFLAG+RPATHFLAG) % x
}.join }.quote.join
end end
def try_link0(src, opt="", &b) def try_link0(src, opt="", &b)
@ -541,10 +541,9 @@ def find_header(header, *paths)
else else
found = false found = false
paths.each do |dir| paths.each do |dir|
opt = "-I#{dir}" opt = "-I#{dir}".quote
if try_cpp(cpp_include(header), opt) if try_cpp(cpp_include(header), opt)
$INCFLAGS += " " $INCFLAGS << " " << opt
$INCFLAGS += opt
found = true found = true
break break
end end
@ -682,7 +681,7 @@ def dir_config(target, idefault=nil, ldefault=nil)
idirs.collect! {|dir| "-I" + dir} idirs.collect! {|dir| "-I" + dir}
idirs -= Shellwords.shellwords($CPPFLAGS) idirs -= Shellwords.shellwords($CPPFLAGS)
unless idirs.empty? unless idirs.empty?
$CPPFLAGS = (idirs << $CPPFLAGS).join(" ") $CPPFLAGS = (idirs.quote << $CPPFLAGS).join(" ")
end end
end end