From 75ced70f56629b11f31c641e7674ed71421ae6cc Mon Sep 17 00:00:00 2001 From: eregon Date: Sat, 28 Oct 2017 20:04:52 +0000 Subject: Ignore the libruby check if it cannot be found * ENV['RUBY_EXE'] can be just 'ruby' and is not an absolute path. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60532 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- spec/ruby/optional/capi/spec_helper.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'spec') diff --git a/spec/ruby/optional/capi/spec_helper.rb b/spec/ruby/optional/capi/spec_helper.rb index f43a9f345b..373012a869 100644 --- a/spec/ruby/optional/capi/spec_helper.rb +++ b/spec/ruby/optional/capi/spec_helper.rb @@ -26,15 +26,15 @@ def compile_extension(name) libruby_so = RbConfig::CONFIG['LIBRUBY_SO'] ruby_library = "#{RbConfig::CONFIG['libdir']}/#{libruby_so}" unless libruby_so and File.exist?(ruby_library) - # Statically-compiled lib in the binary - ruby_library = ENV['RUBY_EXE'] + # Statically-compiled lib in the binary, ignore this check + ruby_library = nil end return lib if File.exist?(lib) and File.mtime(lib) > File.mtime("#{extension_path}/rubyspec.h") and File.mtime(lib) > File.mtime("#{extension_path}/#{ext}.c") and File.mtime(lib) > File.mtime(ruby_header) and - File.mtime(lib) > File.mtime(ruby_library) and + (!ruby_library || File.mtime(lib) > File.mtime(ruby_library)) and true # sentinel # Copy needed source files to tmpdir -- cgit v1.2.3