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 (egrep_cpp): use inspect to show options.

Browse source 
* lib/mkmf.rb (dir_config): prior configured directories to
  defaults.

* lib/mkmf.rb (dir_config): extract first word to determin
  make command type.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3361 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2003-01-19 19:14:22 +00:00
parent 9e1339a68f
commit 971d5f8480
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
Mon Jan 20 04:14:17 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* lib/mkmf.rb (egrep_cpp): use inspect to show options.
* lib/mkmf.rb (dir_config): prior configured directories to
defaults.
* lib/mkmf.rb (dir_config): extract first word to determin
make command type.
Mon Jan 20 02:15:53 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net> Mon Jan 20 02:15:53 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* ext/aix_mksym.rb: no longer used. * ext/aix_mksym.rb: no longer used.

13
lib/mkmf.rb
View file

@ -279,7 +279,7 @@ def egrep_cpp(pat, src, opt="")
create_tmpsrc(src) create_tmpsrc(src)
xpopen(cpp_command('', opt)) do |f| xpopen(cpp_command('', opt)) do |f|
if Regexp === pat if Regexp === pat
puts(" ruby -ne 'print if /#{pat.source}/'") puts(" ruby -ne 'print if #{pat.inspect}'")
f.grep(pat) {|l| f.grep(pat) {|l|
puts "#{f.lineno}: #{l}" puts "#{f.lineno}: #{l}"
return true return true
@ -513,11 +513,13 @@ def dir_config(target, idefault=nil, ldefault=nil)
if idir if idir
idircflag = "-I" + idir idircflag = "-I" + idir
$CPPFLAGS += " " + idircflag unless $CPPFLAGS.split.include?(idircflag) unless Shellwords.shellwords($CPPFLAGS).include?(idircflag)
$CPPFLAGS = idircflag + " " + $CPPFLAGS
end
end end
if ldir if ldir
$LIBPATH << ldir unless $LIBPATH.include?(ldir) $LIBPATH.unshift(ldir) unless $LIBPATH.include?(ldir)
end end
[idir, ldir] [idir, ldir]
@ -814,12 +816,13 @@ init_mkmf
dir_config("opt") dir_config("opt")
$make = with_config("make-prog", ENV["MAKE"] || "make") $make = with_config("make-prog", ENV["MAKE"] || "make")
make, = Shellwords.shellwords($make)
$nmake = nil $nmake = nil
case case
when $mswin when $mswin
$nmake = ?m if /nmake/i =~ $make $nmake = ?m if /nmake/i =~ make
when $bccwin when $bccwin
$nmake = ?b if /Borland/i =~ `#$make -h` $nmake = ?b if /Borland/i =~ `#{make} -h`
end end
Config::CONFIG["srcdir"] = CONFIG["srcdir"] = Config::CONFIG["srcdir"] = CONFIG["srcdir"] =