summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--lib/mkmf.rb10
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 70899bcb2b..c80c147df6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jul 3 18:35:41 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
+
+ * lib/mkmf.rb: use null device if it exists for cross-compiling.
+
Mon Jul 3 18:19:51 2000 Minero Aoki <aamine@dp.u-netsurf.ne.jp>
* lib/net/protocol.rb, smtp.rb, pop.rb, http.rb: 1.1.26.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 1f9373a225..d09b85b875 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -33,11 +33,15 @@ if RUBY_PLATFORM == "m68k-human"
elsif RUBY_PLATFORM =~ /-nextstep|-rhapsody/
CFLAGS.gsub!( /-arch\s\w*/, '' )
end
-if /win32|djgpp|mingw32|m68k-human|i386-os2_emx/i =~ RUBY_PLATFORM
- $null = open("nul", "w")
+
+if FileTest.readable? 'nul'
+ $null = open('nul', 'w')
+elsif FileTest.readable? '/dev/null'
+ $null = open('/dev/null', 'w')
else
- $null = open("/dev/null", "w")
+ $null = open('test.log', 'w')
end
+
LINK = "#{CONFIG['CC']} -o conftest -I#{$hdrdir} #{CFLAGS} -I#{CONFIG['includedir']} %s #{CONFIG['LDFLAGS']} %s conftest.c %s %s #{CONFIG['LIBS']}"
CPP = "#{CONFIG['CPP']} -E -I#{$hdrdir} #{CFLAGS} -I#{CONFIG['includedir']} %s %s conftest.c"