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

ruby-changes:57804

From: Nobuyoshi <ko1@a...>
Date: Thu, 19 Sep 2019 12:27:21 +0900 (JST)
Subject: [ruby-changes:57804] df3fd50717 (master): Removed mkmf.log dump in Makefile

https://git.ruby-lang.org/ruby.git/commit/?id=df3fd50717

From df3fd5071742397c7c5b908d0632f17aa79c2b51 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Thu, 19 Sep 2019 12:23:55 +0900
Subject: Removed mkmf.log dump in Makefile


diff --git a/ext/-test-/cxxanyargs/extconf.rb b/ext/-test-/cxxanyargs/extconf.rb
index b8b6ba2..7e2449a 100644
--- a/ext/-test-/cxxanyargs/extconf.rb
+++ b/ext/-test-/cxxanyargs/extconf.rb
@@ -2,7 +2,6 @@ https://github.com/ruby/ruby/blob/trunk/ext/-test-/cxxanyargs/extconf.rb#L2
 
 cxx = MakeMakefile["C++"]
 
-begin
 ok = cxx.try_compile(<<~'begin', "") do |x|
   #include "ruby/config.h"
 
@@ -21,11 +20,7 @@ begin https://github.com/ruby/ruby/blob/trunk/ext/-test-/cxxanyargs/extconf.rb#L20
   # subject we are going to test in this extension library.
   x.sub! %<#include "ruby.h">, ''
 end
-rescue
-end
 
 if ok
   create_makefile("-test-/cxxanyargs")
-else
-  File.write("Makefile", "all:\n\tcat mkmf.log\n")
 end
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 1480ad6..9d4abdc 100755
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -271,9 +271,11 @@ def extmake(target, basedir = 'ext', maybestatic = true) https://github.com/ruby/ruby/blob/trunk/ext/extmk.rb#L271
   ensure
     Logging::log_close
     if error
-      STDERR.print("#{message}\n\t#{error.backtrace.join("\n\t")}\n")
-      if File.exist?("mkmf.log")
-        IO.copy_stream("mkmf.log", STDERR)
+      begin
+        if File.exist?("mkmf.log")
+          IO.copy_stream("mkmf.log", STDERR)
+        end
+      rescue SystemCallError
       end
     end
     if rbconfig0
-- 
cgit v0.10.2


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

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