diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | lib/mkmf.rb | 6 |
2 files changed, 12 insertions, 3 deletions
@@ -1,3 +1,12 @@ +Tue Apr 9 13:40:31 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp> + + * 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. + Tue Apr 9 12:44:59 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp> * ext/stringio/stringio.c (check_modifiable): performance diff --git a/lib/mkmf.rb b/lib/mkmf.rb index a1706e0dbf..6ce571301b 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 |