diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-08-07 05:19:29 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-08-07 05:19:29 +0000 |
| commit | c260a0c70c0eb6fa3608eaab6372e867afac56a7 (patch) | |
| tree | ca2581bd1f62a74ea7d9063f06aa0e9ffbe8db41 /lib | |
| parent | a438fce7e349c38fc9d0136da79806c2adf357ba (diff) | |
* lib/mkmf.rb: change instance variable to global.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28897 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index f8ca103d11..4cf84c6623 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -17,6 +17,7 @@ SRC_EXT = %w[c m].concat(CXX_EXT) $static = nil $config_h = '$(arch_hdrdir)/ruby/config.h' $default_static = $static +$ignore_error = $nmake ? '' : ' 2> /dev/null || true' unless defined? $configure_args $configure_args = {} @@ -1813,7 +1814,6 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""} mfile.print "install: install-so install-rb\n\n" sodir = (dir = "$(RUBYARCHDIR)").dup mfile.print("install-so: ") - @ignore_error = $nmake ? '' : ' 2> /dev/null || true' if target f = "$(DLLIB)" dest = "#{dir}/#{f}" @@ -1821,7 +1821,7 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""} if $extout mfile.print "clean-so::\n" mfile.print "\t@-$(RM) #{fseprepl[dest]}\n" - mfile.print "\t@-$(RMDIRS) #{fseprepl[dir]}#{@ignore_error}\n" + mfile.print "\t@-$(RMDIRS) #{fseprepl[dir]}#{$ignore_error}\n" else mfile.print "#{dest}: #{f}\n\t@-$(MAKEDIRS) $(@D#{sep})\n" mfile.print "\t$(INSTALL_PROG) #{fseprepl[f]} $(@D#{sep})\n" @@ -1862,7 +1862,7 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""} unless dirs.empty? mfile.print("clean-rb#{sfx}::\n") for dir in dirs.sort_by {|d| -d.count('/')} - mfile.print("\t@-$(RMDIRS) #{fseprepl[dir]}#{@ignore_error}\n") + mfile.print("\t@-$(RMDIRS) #{fseprepl[dir]}#{$ignore_error}\n") end end end @@ -2096,7 +2096,7 @@ distclean-so:: distclean: clean distclean-so distclean-rb-default distclean-rb \t\t@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log \t\t@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES#{sep}) -\t\t@-$(RMDIRS) $(DISTCLEANDIRS#{sep})#{@ignore_error} +\t\t@-$(RMDIRS) $(DISTCLEANDIRS#{sep})#{$ignore_error} realclean: distclean " |