summaryrefslogtreecommitdiff
path: root/ext/extmk.rb
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-26 19:12:55 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-26 19:12:55 +0000
commit943b664eeace274f3235e6dbd3bb2757374a85c0 (patch)
tree29ef9c1b32a8331886ce9955d47d7694e4224115 /ext/extmk.rb
parent79d42a8831cc85dd8f956b54cee78990d184b34a (diff)
extmk.rb: git rid of post-1.8 features
* ext/extmk.rb (extmake): git rid of post-1.8 features for cross compilation. [ruby-core:50160] [Bug #7439] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37870 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/extmk.rb')
-rwxr-xr-xext/extmk.rb12
1 files changed, 9 insertions, 3 deletions
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 40c3f40..084136f 100755
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -1,5 +1,5 @@
#! /usr/local/bin/ruby
-# -*- ruby -*-
+# -*- mode: ruby; coding: us-ascii -*-
$extension = nil
$extstatic = nil
@@ -42,6 +42,12 @@ $" << "mkmf.rb"
load File.expand_path("lib/mkmf.rb", srcdir)
require 'optparse/shellwords'
+if defined?(File::NULL)
+ @null = File::NULL
+elsif !File.chardev?(@null = "/dev/null")
+ @null = "nul"
+end
+
def sysquote(x)
@quote ||= /os2/ =~ (CROSS_COMPILING || RUBY_PLATFORM)
@quote ? x.quote : x
@@ -190,7 +196,7 @@ def extmake(target)
stdout = $stdout.dup
stderr = $stderr.dup
unless verbose?
- $stderr.reopen($stdout.reopen(File::NULL))
+ $stderr.reopen($stdout.reopen(@null))
end
begin
load $0 = conf
@@ -225,7 +231,7 @@ def extmake(target)
mess = "Failed to configure #{target}. It will not be installed.\n"
if error
- mess.prepend(error.to_s + "\n")
+ mess = "#{error}\n#{mess}"
end
Logging::message(mess)