From f4be432d180c6069126f048e749ae2fa2f7ff190 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 7 Feb 2009 03:31:04 +0000 Subject: * runruby.rb: added --cpu option. * runruby.rb: skips version check in rbconfig.rb. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22105 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 +++++- runruby.rb | 7 +++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9c7b7e851..c951b210e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,11 @@ -Sat Feb 7 11:57:13 2009 Nobuyoshi Nakada +Sat Feb 7 12:31:03 2009 Nobuyoshi Nakada * runruby.rb: added --precommand and --show options. + * runruby.rb: added --cpu option. + + * runruby.rb: skips version check in rbconfig.rb. + Sat Feb 7 11:44:06 2009 Nobuyoshi Nakada * lib/mkmf.rb (have_header): needs dependent headers if trying to diff --git a/runruby.rb b/runruby.rb index 900469c1d..b2a8802be 100755 --- a/runruby.rb +++ b/runruby.rb @@ -13,6 +13,8 @@ while arg = ARGV[0] srcdir = value when re =~ "archdir" archdir = value + when re =~ "cpu" + precommand << "arch" << "-arch" << value when re =~ "extout" extout = value when re =~ "pure" @@ -37,8 +39,9 @@ archdir ||= '.' abs_archdir = File.expand_path(archdir) $:.unshift(abs_archdir) -require 'rbconfig' -config = RbConfig::CONFIG +config = File.read(conffile = File.join(abs_archdir, 'rbconfig.rb')) +config.sub!(/^(\s*)RUBY_VERSION\s*==.*(\sor\s*)$/, '\1true\2') +config = Module.new {module_eval(config, conffile)}::Config::CONFIG ruby = File.join(archdir, config["RUBY_INSTALL_NAME"]+config['EXEEXT']) unless File.exist?(ruby) -- cgit