kosaki	2012-12-26 12:00:13 +0900 (Wed, 26 Dec 2012)

  New Revision: 38619

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

  Log:
    * configure.in: enable -fPIE when checking -pie for fixing
      OpenBSD build error. Patch by George Koehler. Thank you!
      [Bug #7606] [ruby-core:51082]

  Modified files:
    trunk/ChangeLog
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 38618)
+++ configure.in	(revision 38619)
@@ -2708,14 +2708,21 @@ AS_CASE("$enable_shared", [yes], [ https://github.com/ruby/ruby/blob/trunk/configure.in#L2708
   if test "$GCC" = yes -a -z "$EXTSTATIC" -a "x$pie" != xno; then
     RUBY_TRY_CFLAGS(-fPIE, [pie=yes], [pie=no])
     if test "$pie" = yes; then
-      RUBY_APPEND_OPTION(XCFLAGS, -fPIE)
+      # Use -fPIE when testing -pie.  RUBY_TRY_LDFLAGS sets
+      # $save_CFLAGS internally, so set other name here.
+      save_CFLAGS_before_pie="$CFLAGS"
+      CFLAGS="$CFLAGS -fPIE"
+
+      # gcc need -pie but clang need -Wl,-pie.
       for pie in -pie -Wl,-pie; do
 	RUBY_TRY_LDFLAGS([$pie], [], [pie=])
 	if test "x$pie" != x; then
+	  RUBY_APPEND_OPTION(XCFLAGS, -fPIE)
 	  RUBY_APPEND_OPTION(XLDFLAGS, $pie)
 	  break
 	fi
       done
+      CFLAGS="$save_CFLAGS_before_pie"
     fi
   fi
 ])
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 38618)
+++ ChangeLog	(revision 38619)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Dec 26 11:54:11 2012  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* configure.in: enable -fPIE when checking -pie for fixing
+	  OpenBSD build error. Patch by George Koehler. Thank you!
+	  [Bug #7606] [ruby-core:51082]
+
 Wed Dec 26 07:31:24 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* string.c (rb_enc_cr_str_copy_for_substr): empty string is always

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