aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-06-14 13:49:51 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-06-14 13:49:51 +0000
commitb1644bfca9be98395eb951cccb592fe0bafc873a (patch)
tree0df197f869acebdce408c235fd344088506d0f5d
parentea325fcd6757b5cbd8060d216d7645be72da5e62 (diff)
downloadruby-b1644bfca9be98395eb951cccb592fe0bafc873a.tar.gz
fix CPPOUTFILE
* configure.in (RUBY_CPPOUTFILE): check if output file is actually created. [ruby-dev:45742] [Bug#6591] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36086 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--configure.in5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index aac5f12899..b5ea9fcfe5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 14 22:49:44 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * configure.in (RUBY_CPPOUTFILE): check if output file is actually
+ created. [ruby-dev:45742] [Bug#6591]
+
Thu Jun 14 22:10:50 2012 Tanaka Akira <akr@fsij.org>
* process.c (proc_exec_sh): don't strip leading spaces of the script.
diff --git a/configure.in b/configure.in
index de2207360a..964b96d5d7 100644
--- a/configure.in
+++ b/configure.in
@@ -137,8 +137,9 @@ AC_DEFUN([RUBY_NACL_CHECK_PEPPER_TYPES],
AC_DEFUN([RUBY_CPPOUTFILE],
[AC_CACHE_CHECK(whether ${CPP} accepts -o, rb_cv_cppoutfile,
[cppflags=$CPPFLAGS
-CPPFLAGS='-o conftest.i'
-AC_TRY_CPP([], rb_cv_cppoutfile=yes, rb_cv_cppoutfile=no)
+CPPFLAGS='-o conftest-1.i'
+rb_cv_cppoutfile=no
+AC_TRY_CPP([], [test -f conftest-1.i && rb_cv_cppoutfile=yes])
CPPFLAGS=$cppflags
rm -f conftest*])
if test "$rb_cv_cppoutfile" = yes; then