diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-11-16 14:25:53 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-11-16 14:25:53 +0000 |
commit | 5a483d1943ce7aa7eb88e57c84c01229b9bc0cb8 (patch) | |
tree | 3f7220532a9ea5c18c9aafab3104af6d89277288 /ext/extmk.rb | |
parent | b30b46d139f697fdd9d403345b47b5b867e236f2 (diff) |
* common.mk (static-ruby): overridable.
* ext/extmk.rb (parse_args): force to link extensions statically only
if static is given for extstatic.
* ext/extmk.rb (RUBY, RUBYW): overridable.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9550 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/extmk.rb')
-rw-r--r-- | ext/extmk.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ext/extmk.rb b/ext/extmk.rb index 79e44b9e63..ec544f2b4e 100644 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -217,8 +217,7 @@ def parse_args() if ($extstatic = v) == false $extstatic = [] elsif v - $force_static = true - $extstatic.delete("static") + $force_static = true if $extstatic.delete("static") $extstatic = nil if $extstatic.empty? end end @@ -232,6 +231,7 @@ def parse_args() $make = v || 'make' end opts.on('--make-flags=FLAGS', '--mflags', Shellwords) do |v| + v.grep(/\A([-\w]+)=(.*)/) {$configure_args["--#{$1}"] = $2} if arg = v.first arg.insert(0, '-') if /\A[^-][^=]*\Z/ =~ arg end @@ -326,7 +326,7 @@ end for dir in ["ext", File::join($top_srcdir, "ext")] setup = File::join(dir, CONFIG['setup']) if File.file? setup - f = open(setup) + f = open(setup) while line = f.gets() line.chomp! line.sub!(/#.*$/, '') @@ -458,9 +458,11 @@ SRC $mflags.concat(conf) end rubies = [] -%w[RUBY RUBYW].each {|r| +%w[RUBY RUBYW STATIC_RUBY].each {|r| + n = r if r = arg_config("--"+r.downcase) || config_string(r+"_INSTALL_NAME") rubies << r+EXEEXT + $mflags << "#{n}=#{r}" end } |