diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-11 02:53:47 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-11 02:53:47 +0000 |
commit | 76d8cc33f9ef4f8d17bb8516a26e1d41e10cbc0f (patch) | |
tree | 676df4badac694dc101ab52cccb6dd73202cf86f /lib | |
parent | c0035ed35141b2675ec0f395b3a214f967ad7190 (diff) | |
download | ruby-76d8cc33f9ef4f8d17bb8516a26e1d41e10cbc0f.tar.gz |
mkmf.rb: defer use of instance variable
* lib/mkmf.rb (MakeMakefile#dir_config, MakeMakefile#_libdir_basename):
defer use of instance variable until needed. [Bug #8074]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39717 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/mkmf.rb | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index fc12465123..e208515e8a 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -45,6 +45,16 @@ end # correctly compile and link the C extension to ruby and a third-party # library. module MakeMakefile + #### defer until this module become global-state free. + # def self.extended(obj) + # obj.init_mkmf + # super + # end + # + # def initialize(*args, rbconfig: RbConfig, **rest) + # init_mkmf(rbconfig::MAKEFILE_CONFIG, rbconfig::CONFIG) + # super(*args, **rest) + # end ## # The makefile configuration using the defaults from when ruby was built. @@ -1676,7 +1686,7 @@ SRC idir = with_config(target + "-include", idefault) $arg_config.last[1] ||= "${#{target}-dir}/include" ldir = with_config(target + "-lib", ldefault) - $arg_config.last[1] ||= "${#{target}-dir}/#{@libdir_basename}" + $arg_config.last[1] ||= "${#{target}-dir}/#{_libdir_basename}" idirs = idir ? Array === idir ? idir.dup : idir.split(File::PATH_SEPARATOR) : [] if defaults @@ -1693,7 +1703,7 @@ SRC ldirs = ldir ? Array === ldir ? ldir.dup : ldir.split(File::PATH_SEPARATOR) : [] if defaults - ldirs.concat(defaults.collect {|d| "#{d}/#{@libdir_basename}"}) + ldirs.concat(defaults.collect {|d| "#{d}/#{_libdir_basename}"}) ldir = ([ldir] + ldirs).compact.join(File::PATH_SEPARATOR) end $LIBPATH = ldirs | $LIBPATH @@ -2378,8 +2388,6 @@ site-install-rb: install-rb $extout ||= nil $extout_prefix ||= nil - @libdir_basename = config["libdir"] && config["libdir"][/\A\$\(exec_prefix\)\/(.*)/, 1] or "lib" - $arg_config.clear dir_config("opt") end @@ -2404,6 +2412,12 @@ MESSAGE end end + private + + def _libdir_basename + @libdir_basename ||= config_string("libdir") {|name| name[/\A\$\(exec_prefix\)\/(.*)/, 1]} || "lib" + end + extend self init_mkmf |