diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-04-09 04:43:12 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-04-09 04:43:12 +0000 |
| commit | 8682ffcee348e8cff455e02789a8862b0c2841f3 (patch) | |
| tree | 0292ce8f34c68ab873c122787b7b29036430f9ce /lib | |
| parent | 489c380cd6eacdd3e3e2f038342b6c1ad117e319 (diff) | |
| download | ruby-8682ffcee348e8cff455e02789a8862b0c2841f3.tar.gz ruby-8682ffcee348e8cff455e02789a8862b0c2841f3.tar.xz ruby-8682ffcee348e8cff455e02789a8862b0c2841f3.zip | |
* lib/mkmf.rb (try_link0): need expand macro in command, sync with
ext/extmk.rb.in.
* lib/mkmf.rb (try_cpp): ditto.
* lib/mkmf.rb (egrep_cpp): ditto.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index a1706e0db..6ce571301 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -124,7 +124,7 @@ def try_link0(src, opt="") $LIBPATH.each {|d| $LDFLAGS << " -L" + d} end begin - xsystem(format(LINK, $CFLAGS, $CPPFLAGS, $LDFLAGS, opt, $LOCAL_LIBS)) + xsystem(Config.expand(format(LINK, $CFLAGS, $CPPFLAGS, $LDFLAGS, opt, $LOCAL_LIBS))) ensure $LDFLAGS = ldflags ENV['LIB'] = ORIG_LIBPATH if /mswin32/ =~ RUBY_PLATFORM @@ -144,7 +144,7 @@ def try_cpp(src, opt="") cfile.print src cfile.close begin - xsystem(format(CPP, $CPPFLAGS, $CFLAGS, opt)) + xsystem(Config.expand(format(CPP, $CPPFLAGS, $CFLAGS, opt))) ensure rm_f "conftest*" end @@ -155,7 +155,7 @@ def egrep_cpp(pat, src, opt="") cfile.print src cfile.close begin - xsystem(format(CPP+"|egrep #{pat}", $CPPFLAGS, $CFLAGS, opt)) + xsystem(Config.expand(format(CPP, $CPPFLAGS, $CFLAGS, opt))+"|egrep #{pat}") ensure rm_f "conftest*" end |