mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@2346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
e223518948
commit
afc4cd48d1
2 changed files with 12 additions and 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>
|
Tue Apr 9 12:44:59 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
|
||||||
|
|
||||||
* ext/stringio/stringio.c (check_modifiable): performance
|
* ext/stringio/stringio.c (check_modifiable): performance
|
||||||
|
|
|
@ -124,7 +124,7 @@ def try_link0(src, opt="")
|
||||||
$LIBPATH.each {|d| $LDFLAGS << " -L" + d}
|
$LIBPATH.each {|d| $LDFLAGS << " -L" + d}
|
||||||
end
|
end
|
||||||
begin
|
begin
|
||||||
xsystem(format(LINK, $CFLAGS, $CPPFLAGS, $LDFLAGS, opt, $LOCAL_LIBS))
|
xsystem(Config.expand(format(LINK, $CFLAGS, $CPPFLAGS, $LDFLAGS, opt, $LOCAL_LIBS)))
|
||||||
ensure
|
ensure
|
||||||
$LDFLAGS = ldflags
|
$LDFLAGS = ldflags
|
||||||
ENV['LIB'] = ORIG_LIBPATH if /mswin32/ =~ RUBY_PLATFORM
|
ENV['LIB'] = ORIG_LIBPATH if /mswin32/ =~ RUBY_PLATFORM
|
||||||
|
@ -144,7 +144,7 @@ def try_cpp(src, opt="")
|
||||||
cfile.print src
|
cfile.print src
|
||||||
cfile.close
|
cfile.close
|
||||||
begin
|
begin
|
||||||
xsystem(format(CPP, $CPPFLAGS, $CFLAGS, opt))
|
xsystem(Config.expand(format(CPP, $CPPFLAGS, $CFLAGS, opt)))
|
||||||
ensure
|
ensure
|
||||||
rm_f "conftest*"
|
rm_f "conftest*"
|
||||||
end
|
end
|
||||||
|
@ -155,7 +155,7 @@ def egrep_cpp(pat, src, opt="")
|
||||||
cfile.print src
|
cfile.print src
|
||||||
cfile.close
|
cfile.close
|
||||||
begin
|
begin
|
||||||
xsystem(format(CPP+"|egrep #{pat}", $CPPFLAGS, $CFLAGS, opt))
|
xsystem(Config.expand(format(CPP, $CPPFLAGS, $CFLAGS, opt))+"|egrep #{pat}")
|
||||||
ensure
|
ensure
|
||||||
rm_f "conftest*"
|
rm_f "conftest*"
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Reference in a new issue