From df3fd5071742397c7c5b908d0632f17aa79c2b51 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Thu, 19 Sep 2019 12:23:55 +0900 Subject: Removed mkmf.log dump in Makefile --- ext/-test-/cxxanyargs/extconf.rb | 5 ----- ext/extmk.rb | 8 +++++--- 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'ext') diff --git a/ext/-test-/cxxanyargs/extconf.rb b/ext/-test-/cxxanyargs/extconf.rb index b8b6ba2fd3..7e2449a457 100644 --- a/ext/-test-/cxxanyargs/extconf.rb +++ b/ext/-test-/cxxanyargs/extconf.rb @@ -2,7 +2,6 @@ cxx = MakeMakefile["C++"] -begin ok = cxx.try_compile(<<~'begin', "") do |x| #include "ruby/config.h" @@ -21,11 +20,7 @@ begin # 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 1480ad6ffe..9d4abdc2a2 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -271,9 +271,11 @@ def extmake(target, basedir = 'ext', maybestatic = true) 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 v1.2.3