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

ruby-changes:21819

From: nobu <ko1@a...>
Date: Sun, 27 Nov 2011 18:25:49 +0900 (JST)
Subject: [ruby-changes:21819] nobu:r33868 (trunk): * configure.in (-fstack-protector): also needed in DLDFLAGS.

nobu	2011-11-27 18:25:38 +0900 (Sun, 27 Nov 2011)

  New Revision: 33868

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33868

  Log:
    * configure.in (-fstack-protector): also needed in DLDFLAGS.
      [Bug#5676]

  Modified files:
    trunk/ChangeLog
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 33867)
+++ configure.in	(revision 33868)
@@ -497,8 +497,12 @@
 fi
 if test "$GCC" = yes; then
     RUBY_TRY_CFLAGS(-D_FORTIFY_SOURCE=2, [RUBY_APPEND_OPTION(XCFLAGS, -D_FORTIFY_SOURCE=2)])
-    RUBY_TRY_CFLAGS(-fstack-protector, [RUBY_APPEND_OPTION(XCFLAGS, -fstack-protector)
-				        RUBY_APPEND_OPTION(XLDFLAGS, -fstack-protector)])
+    RUBY_TRY_CFLAGS(-fstack-protector, [stack_protector=yes], [stack_protector=no])
+    if test "x$stack_protector" = xyes; then
+	RUBY_APPEND_OPTION(XCFLAGS, -fstack-protector)
+	RUBY_APPEND_OPTION(XLDFLAGS, -fstack-protector)
+	RUBY_APPEND_OPTION(DLDFLAGS, -fstack-protector)
+    fi
 fi
 
 if test "$GCC" = ""; then
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33867)
+++ ChangeLog	(revision 33868)
@@ -1,3 +1,8 @@
+Sun Nov 27 18:25:30 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (-fstack-protector): also needed in DLDFLAGS.
+	  [Bug#5676]
+
 Sun Nov 27 14:13:33 2011  KOSAKI Motohiro  <kosaki.motohiro@g...>
 
 	* configure.in: add -fstack-protector into XLDFLAGS as well as

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

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