diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-06 04:00:38 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-06 04:00:38 +0000 |
commit | 98dd8c828a33e0dfd0becfcd13babb4ca25e3596 (patch) | |
tree | 2bec70a1eb44e3273292739fef26c4c5b0af5e5e /lib/mkmf.rb | |
parent | d75a3df691b94d34dc781bc3cdf60dc2b3bf34bb (diff) | |
download | ruby-98dd8c828a33e0dfd0becfcd13babb4ca25e3596.tar.gz ruby-98dd8c828a33e0dfd0becfcd13babb4ca25e3596.tar.xz ruby-98dd8c828a33e0dfd0becfcd13babb4ca25e3596.zip |
* lib/mkmf.rb (check_sizeof): added optional compiler option
argument. [ruby-core:24785]
* lib/mkmf.rb (create_makefile): suppressed shadowing outer local
variable warnings.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24418 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/mkmf.rb')
-rw-r--r-- | lib/mkmf.rb | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 9c1b838ac..c5e4bd89b 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -155,7 +155,9 @@ end topdir = File.dirname(libdir = File.dirname(__FILE__)) extdir = File.expand_path("ext", topdir) path = File.expand_path($0) -$extmk = path[0, topdir.size+1] == topdir+"/" && %r"\A(ext|enc|tool)\z" =~ File.dirname(path[topdir.size+1..-1]) +$extmk = path[0, topdir.size+1] == topdir+"/" +$extmk &&= %r"\A(?:ext|enc|tool|test(?:/.+))\z" =~ File.dirname(path[topdir.size+1..-1]) +$extmk &&= true if not $extmk and File.exist?(($hdrdir = RbConfig::CONFIG["rubyhdrdir"]) + "/ruby/ruby.h") $topdir = $hdrdir $top_srcdir = $hdrdir @@ -990,7 +992,7 @@ end # For example, if check_sizeof('mystruct') returned 12, then the # SIZEOF_MYSTRUCT=12 preprocessor macro would be passed to the compiler. # -def check_sizeof(type, headers = nil, &b) +def check_sizeof(type, headers = nil, opts = "", &b) typename, member = type.split('.', 2) prelude = cpp_include(headers).split(/$/) prelude << "typedef #{typename} rbcv_typedef_;\n" @@ -1812,19 +1814,19 @@ site-install-rb: install-rb return unless target - mfile.puts SRC_EXT.collect {|ext| ".path.#{ext} = $(VPATH)"} if $nmake == ?b + mfile.puts SRC_EXT.collect {|e| ".path.#{e} = $(VPATH)"} if $nmake == ?b mfile.print ".SUFFIXES: .#{SRC_EXT.join(' .')} .#{$OBJEXT}\n" mfile.print "\n" - CXX_EXT.each do |ext| + CXX_EXT.each do |e| COMPILE_RULES.each do |rule| - mfile.printf(rule, ext, $OBJEXT) + mfile.printf(rule, e, $OBJEXT) mfile.printf("\n\t%s\n\n", COMPILE_CXX) end end - %w[c].each do |ext| + %w[c].each do |e| COMPILE_RULES.each do |rule| - mfile.printf(rule, ext, $OBJEXT) + mfile.printf(rule, e, $OBJEXT) mfile.printf("\n\t%s\n\n", COMPILE_C) end end |