Skip to content

Commit

Permalink
Removed mkmf.log dump in Makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
nobu committed Sep 19, 2019
1 parent 66c644d commit df3fd50
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
5 changes: 0 additions & 5 deletions ext/-test-/cxxanyargs/extconf.rb
Expand Up @@ -2,7 +2,6 @@

cxx = MakeMakefile["C++"]

begin
ok = cxx.try_compile(<<~'begin', "") do |x|
#include "ruby/config.h"
Expand All @@ -21,11 +20,7 @@
# 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
8 changes: 5 additions & 3 deletions ext/extmk.rb
Expand Up @@ -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
Expand Down

0 comments on commit df3fd50

Please sign in to comment.