aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/mkmf.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b3211fc22d..7de1f38715 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul 5 09:53:15 2013 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/mkmf.rb (CONFIG['CPPOUTFILE']): fix r41769; CONFIG['CPPOUTFILE']
+ may be nil.
+
Fri Jul 5 05:39:53 2013 Tanaka Akira <akr@fsij.org>
* bignum.c (BARY_MUL1): Renamed from BARY_MUL.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 749e7a5c7c..cdb51e05c8 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -251,7 +251,7 @@ module MakeMakefile
OUTFLAG = CONFIG['OUTFLAG']
COUTFLAG = CONFIG['COUTFLAG']
- CPPOUTFILE = CONFIG['CPPOUTFILE'].sub(/\bconftest\b/, CONFTEST)
+ CPPOUTFILE = CONFIG['CPPOUTFILE'] ? CONFIG['CPPOUTFILE'].sub(/\bconftest\b/, CONFTEST) : nil
def rm_f(*files)
opt = (Hash === files.last ? [files.pop] : [])