[前][次][番号順一覧][スレッド一覧]

ruby-changes:51236

From: ngoto <ko1@a...>
Date: Wed, 16 May 2018 12:57:55 +0900 (JST)
Subject: [ruby-changes:51236] ngoto:r63442 (trunk): configure.ac: revert r63438

ngoto	2018-05-16 12:57:50 +0900 (Wed, 16 May 2018)

  New Revision: 63442

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=63442

  Log:
    configure.ac: revert r63438

  Modified files:
    trunk/configure.ac
Index: configure.ac
===================================================================
--- configure.ac	(revision 63441)
+++ configure.ac	(revision 63442)
@@ -836,7 +836,16 @@ main() https://github.com/ruby/ruby/blob/trunk/configure.ac#L836
 		    AS_IF([test x"$define_xopen_source" != x], [
 		        break
 		    ])
-		    RUBY_WERROR_FLAG([AC_TRY_COMPILE([
+		    # Both AC_TRY_CPP and AC_TRY_COMPILE should pass
+		    # because some options may not be set to CPPFLAGS.
+		    AC_TRY_CPP([
+			#define _XOPEN_SOURCE ${tmp_xpg}00
+			#include <unistd.h>
+			#ifndef _XPG${tmp_xpg}
+			#error _XPG${tmp_xpg} should be defined by _XOPEN_SOURCE=${tmp_xpg}00
+			#endif
+			], [
+			AC_TRY_COMPILE([
 			#define _XOPEN_SOURCE ${tmp_xpg}00
 			#include <unistd.h>
 			#ifndef _XPG${tmp_xpg}
@@ -844,7 +853,7 @@ main() https://github.com/ruby/ruby/blob/trunk/configure.ac#L853
 			#endif
 			], [],
 			[define_xopen_source=${tmp_xpg}00], [])
-			])
+			], [])
 		  done
 		  AS_IF([test x"$define_xopen_source" = x], [
 		    define_xopen_source=no
@@ -852,16 +861,6 @@ main() https://github.com/ruby/ruby/blob/trunk/configure.ac#L861
 		  AC_MSG_RESULT($define_xopen_source)
 		  AS_IF([test x"$define_xopen_source" != xno], [
 		    RUBY_APPEND_OPTIONS(CPPFLAGS, -D_XOPEN_SOURCE=$define_xopen_source)
-		    # On Solaris, with gcc, "-std=gnu99" would be needed
-		    # for using "-D_XOPEN_SOURCE=nnn" when nnn >= 600.
-		    # ("-std=gnu99" have been added to both $warnflags and
-		    #  $strict_warnflags. During the above AC_TRY_COMPILE,
-		    #  $warnflags is effective, but the value will later be
-		    #  replaced with $rb_cv_warnflags.)
-		    AS_CASE(["${warnflags}"],
-		    [*-std=gnu99*], [
-		      RUBY_APPEND_OPTIONS(CPPFLAGS, -std=gnu99)
-		    ])
 		  ])
 		])
 		],

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]