diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-06-26 02:07:30 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-06-26 02:07:30 +0000 |
| commit | 11ab1ee8ce83970f6c375fed025daf76e37e6cd1 (patch) | |
| tree | 36856c9106ed555f5cec856516cc3a7acb14e8fb | |
| parent | 9785c5a969bcf1514a7b20b43987be88d8c81d84 (diff) | |
| download | ruby-11ab1ee8ce83970f6c375fed025daf76e37e6cd1.tar.gz ruby-11ab1ee8ce83970f6c375fed025daf76e37e6cd1.tar.xz ruby-11ab1ee8ce83970f6c375fed025daf76e37e6cd1.zip | |
* lib/mkmf.rb (libpathflag, find_header, dir_config): quote directory
names if necessary. [ruby-talk:104505]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@6524 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mkmf.rb | 9 |
2 files changed, 8 insertions, 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 diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 0561c8bdb..f132bf31b 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -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 |