[前][次][番号順一覧][スレッド一覧]

ruby-changes:48418

From: eregon <ko1@a...>
Date: Sun, 29 Oct 2017 05:04:59 +0900 (JST)
Subject: [ruby-changes:48418] eregon:r60532 (trunk): Ignore the libruby check if it cannot be found

eregon	2017-10-29 05:04:52 +0900 (Sun, 29 Oct 2017)

  New Revision: 60532

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=60532

  Log:
    Ignore the libruby check if it cannot be found
    
    * ENV['RUBY_EXE'] can be just 'ruby' and is not an absolute path.

  Modified files:
    trunk/spec/ruby/optional/capi/spec_helper.rb
Index: spec/ruby/optional/capi/spec_helper.rb
===================================================================
--- spec/ruby/optional/capi/spec_helper.rb	(revision 60531)
+++ spec/ruby/optional/capi/spec_helper.rb	(revision 60532)
@@ -26,15 +26,15 @@ def compile_extension(name) https://github.com/ruby/ruby/blob/trunk/spec/ruby/optional/capi/spec_helper.rb#L26
   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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]