1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

extmk.rb: removed compiled? method [ci skip]

Browse Source 
* 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
This commit is contained in:
nobu 2016-11-18 04:34:26 +00:00
parent 53ca8de37f
commit 5bb84ec7d8
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ext/extmk.rb
View File

@ -26,7 +26,6 @@ alias $PROGRAM_NAME $0
alias $0 $progname alias $0 $progname
$extlist = [] $extlist = []
$compiled = {}
DUMMY_SIGNATURE = "***DUMMY MAKEFILE***" DUMMY_SIGNATURE = "***DUMMY MAKEFILE***"
@ -167,7 +166,6 @@ def extmake(target, basedir = (maybestatic = 'ext'))
$objs = [] $objs = []
$srcs = [] $srcs = []
$extso = [] $extso = []
$compiled[target] = false
makefile = "./Makefile" makefile = "./Makefile"
static = $static static = $static
$static = nil if noinstall = File.fnmatch?("-*", target) $static = nil if noinstall = File.fnmatch?("-*", target)
@ -277,7 +275,6 @@ def extmake(target, basedir = (maybestatic = 'ext'))
unless $configure_only or system($make, *args) unless $configure_only or system($make, *args)
$ignore or $continue or return false $ignore or $continue or return false
end end
$compiled[target] = true
if $clean if $clean
FileUtils.rm_f("mkmf.log") FileUtils.rm_f("mkmf.log")
if $clean != true if $clean != true
@ -325,10 +322,6 @@ def extmake(target, basedir = (maybestatic = 'ext'))
true true
end end
def compiled?(target)
$compiled[target]
end
def parse_args() def parse_args()
$mflags = [] $mflags = []
$makeflags = [] # for make command to build ruby, so quoted $makeflags = [] # for make command to build ruby, so quoted

2
ext/win32/extconf.rb
View File

@ -1,4 +1,4 @@
# frozen_string_literal: false # frozen_string_literal: false
if compiled?('fiddle') and $mswin||$mingw||$cygwin if $mswin||$mingw||$cygwin
create_makefile('win32') create_makefile('win32')
end end