From 7f6e8dfb80ac0ed4f19f773117e16073ac3109f6 Mon Sep 17 00:00:00 2001 From: eban Date: Tue, 5 Jun 2001 04:54:52 +0000 Subject: * ext/extmk.rb.in, lib/mkmf.rb (xsystem): write log file. print command line. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1502 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/mkmf.rb | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'lib') diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 8ca32c9b6..22d2b2e00 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -37,13 +37,7 @@ elsif RUBY_PLATFORM =~ /-nextstep|-rhapsody|-darwin/ CFLAGS.gsub!( /-arch\s\w*/, '' ) end -if FileTest.readable? 'nul' - $null = open('nul', 'w') -elsif FileTest.readable? '/dev/null' - $null = open('/dev/null', 'w') -else - $null = open('test.log', 'w') -end +$log = open('mkmf.log', 'w') LINK = "#{CONFIG['CC']} -o conftest -I#{$hdrdir} #{CFLAGS} -I#{CONFIG['includedir']} %s %s #{CONFIG['LDFLAGS']} %s conftest.c %s %s #{CONFIG['LIBS']}" CPP = "#{CONFIG['CPP']} -E %s -I#{$hdrdir} #{CFLAGS} -I#{CONFIG['includedir']} %s %s conftest.c" @@ -64,11 +58,12 @@ $orgout = $stdout.dup def xsystem command Config.expand(command) if $DEBUG - print command, "\n" + puts command return system(command) end - $stderr.reopen($null) - $stdout.reopen($null) + $stderr.reopen($log) + $stdout.reopen($log) + puts command r = system(command) $stderr.reopen($orgerr) $stdout.reopen($orgout) -- cgit