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

ruby-changes:21880

From: nobu <ko1@a...>
Date: Fri, 2 Dec 2011 15:41:36 +0900 (JST)
Subject: [ruby-changes:21880] nobu:r33929 (trunk): * configure.in: check whether -pie or -Wl,-pie is valid as

nobu	2011-12-02 15:41:27 +0900 (Fri, 02 Dec 2011)

  New Revision: 33929

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

  Log:
    * configure.in: check whether -pie or -Wl,-pie is valid as
      LDFLAGS.  [ruby-core:41438] [Bug#5697]

  Modified files:
    trunk/ChangeLog
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 33928)
+++ configure.in	(revision 33929)
@@ -2440,8 +2440,17 @@
 
   # enable PIE if possible
   if test "$GCC" = yes; then
-    RUBY_TRY_CFLAGS(-fPIE, [RUBY_APPEND_OPTION(XCFLAGS, -fPIE)
-			    RUBY_APPEND_OPTION(XLDFLAGS, -pie)])
+    RUBY_TRY_CFLAGS(-fPIE, [pie=yes], [pie=no])
+    if test "$pie" = yes; then
+      RUBY_APPEND_OPTION(XCFLAGS, -fPIE)
+      for pie in -pie -Wl,-pie; do
+	RUBY_TRY_LDFLAGS([$pie], [], [pie=])
+	if test "x$pie" != x; then
+	  RUBY_APPEND_OPTION(XLDFLAGS, $pie)
+	  break
+	fi
+      done
+    fi
   fi
 ])
 if test "$enable_rpath" = yes; then
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33928)
+++ ChangeLog	(revision 33929)
@@ -1,5 +1,8 @@
-Fri Dec  2 15:18:18 2011  Nobuyoshi Nakada  <nobu@r...>
+Fri Dec  2 15:41:24 2011  Nobuyoshi Nakada  <nobu@r...>
 
+	* configure.in: check whether -pie or -Wl,-pie is valid as
+	  LDFLAGS.  [ruby-core:41438] [Bug#5697]
+
 	* configure.in: use $linker_flag for LDFLAGS option which is not
 	  limited to particular platforms.
 

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

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