aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-11-18 04:34:26 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-11-18 04:34:26 +0000
commitbc63dcf9c3163595dfffeef508ac96f65a4fbc43 (patch)
tree155c6604539048fd41767d2ad717e33bb0cf974c
parent4344ea4a602c4d505f93766696d1531e07529419 (diff)
downloadruby-bc63dcf9c3163595dfffeef508ac96f65a4fbc43.tar.gz
extmk.rb: removed compiled? method [ci skip]
* ext/extmk.rb (compiled?): removed. * ext/win32/extconf.rb: try to install libraries regardless fiddle. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56822 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rwxr-xr-xext/extmk.rb7
-rw-r--r--ext/win32/extconf.rb2
2 files changed, 1 insertions, 8 deletions
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 86174830b3..04d374ece6 100755
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -26,7 +26,6 @@ alias $PROGRAM_NAME $0
alias $0 $progname
$extlist = []
-$compiled = {}
DUMMY_SIGNATURE = "***DUMMY MAKEFILE***"
@@ -167,7 +166,6 @@ def extmake(target, basedir = (maybestatic = 'ext'))
$objs = []
$srcs = []
$extso = []
- $compiled[target] = false
makefile = "./Makefile"
static = $static
$static = nil if noinstall = File.fnmatch?("-*", target)
@@ -277,7 +275,6 @@ def extmake(target, basedir = (maybestatic = 'ext'))
unless $configure_only or system($make, *args)
$ignore or $continue or return false
end
- $compiled[target] = true
if $clean
FileUtils.rm_f("mkmf.log")
if $clean != true
@@ -325,10 +322,6 @@ def extmake(target, basedir = (maybestatic = 'ext'))
true
end
-def compiled?(target)
- $compiled[target]
-end
-
def parse_args()
$mflags = []
$makeflags = [] # for make command to build ruby, so quoted
diff --git a/ext/win32/extconf.rb b/ext/win32/extconf.rb
index 9952274e29..ceab4ef4f4 100644
--- a/ext/win32/extconf.rb
+++ b/ext/win32/extconf.rb
@@ -1,4 +1,4 @@
# frozen_string_literal: false
-if compiled?('fiddle') and $mswin||$mingw||$cygwin
+if $mswin||$mingw||$cygwin
create_makefile('win32')
end