diff options
| -rwxr-xr-x | ext/extmk.rb | 12 | ||||
| -rw-r--r-- | lib/mkmf.rb | 10 |
2 files changed, 0 insertions, 22 deletions
diff --git a/ext/extmk.rb b/ext/extmk.rb index 97533219ee..848516d535 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -694,18 +694,6 @@ unless $destdir.to_s.empty? end $makeflags.uniq! -if $nmake == ?b - unless (vars = $mflags.grep(/\A\w+=/n)).empty? - open(mkf = "libruby.mk", "wb") do |tmf| - tmf.puts("!include Makefile") - tmf.puts - tmf.puts(*vars.map {|v| v.sub(/\=/, " = ")}) - tmf.puts("PRE_LIBRUBY_UPDATE = del #{mkf}") - end - $mflags.unshift("-f#{mkf}") - vars.each {|flag| flag.sub!(/\A/, "-D")} - end -end $mflags.unshift("topdir=#$topdir") ENV.delete("RUBYOPT") if $configure_only and $command_output diff --git a/lib/mkmf.rb b/lib/mkmf.rb index ccfeba2fb3..8c795b0ae6 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -2015,15 +2015,6 @@ TOUCH = exit > preload = #{defined?($preload) && $preload ? $preload.join(' ') : ''} } - if $nmake == ?b - mk.each do |x| - x.gsub!(/^(MAKEDIRS|INSTALL_(?:PROG|DATA))+\s*=.*\n/) do - "!ifndef " + $1 + "\n" + - $& + - "!endif\n" - end - end - end mk end @@ -2425,7 +2416,6 @@ site-install-rb: install-rb return unless target - mfile.puts SRC_EXT.collect {|e| ".path.#{e} = $(VPATH)"} if $nmake == ?b mfile.print ".SUFFIXES: .#{(SRC_EXT + [$OBJEXT, $ASMEXT]).compact.join(' .')}\n" mfile.print "\n" |