summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-09-01 03:58:01 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-09-01 03:58:01 +0000
commit886bef681a6491b0f0b09943ca13be109edb363c (patch)
tree498123ac2070a33197a8cfaf6a02c89c4f21d686
parenta6447af4da58902cdc465d58bbb5873e1413b8a6 (diff)
no Borland make [ci skip]
* ext/extmk.rb: remove Borland make support. Borland C++ has not been supported since years ago. * lib/mkmf.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56051 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rwxr-xr-xext/extmk.rb12
-rw-r--r--lib/mkmf.rb10
2 files changed, 0 insertions, 22 deletions
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 97533219ee1..848516d535c 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 ccfeba2fb3f..8c795b0ae6e 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"