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

ruby-changes:21878

From: naruse <ko1@a...>
Date: Fri, 2 Dec 2011 13:02:30 +0900 (JST)
Subject: [ruby-changes:21878] naruse:r33927 (trunk): Revert r33926 "* configure.in: use $linker_flag for LDFLAGS option which is not"

naruse	2011-12-02 13:02:20 +0900 (Fri, 02 Dec 2011)

  New Revision: 33927

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

  Log:
    Revert r33926 "* configure.in: use $linker_flag for LDFLAGS option which is not"
    
    This breaks build process of Linux and FreeBSD.
    It may depend the version of gcc.

  Modified files:
    trunk/ChangeLog
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 33926)
+++ configure.in	(revision 33927)
@@ -2346,9 +2346,9 @@
     [freebsd*|dragonfly*], [],
     [
      if test "$GCC" = yes; then
-       RUBY_TRY_LDFLAGS([${linker_flag}--no-undefined], [no_undefined=yes], [no_undefined=no])
+       RUBY_TRY_LDFLAGS([-Wl,--no-undefined], [no_undefined=yes], [no_undefined=no])
        if test "no_undefined" = yes; then
-	  RUBY_APPEND_OPTION(EXTLDFLAGS, [${linker_flag}--no-undefined])
+	  RUBY_APPEND_OPTION(EXTLDFLAGS, [-Wl,--no-undefined])
        fi
      fi
     ])
@@ -2441,7 +2441,7 @@
   # enable PIE if possible
   if test "$GCC" = yes; then
     RUBY_TRY_CFLAGS(-fPIE, [RUBY_APPEND_OPTION(XCFLAGS, -fPIE)
-			    RUBY_APPEND_OPTION(XLDFLAGS, ${linker_flag}-pie)])
+			    RUBY_APPEND_OPTION(XLDFLAGS, -pie)])
   fi
 ])
 if test "$enable_rpath" = yes; then
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33926)
+++ ChangeLog	(revision 33927)
@@ -1,8 +1,3 @@
-Fri Dec  2 11:30:34 2011  Nobuyoshi Nakada  <nobu@r...>
-
-	* configure.in: use $linker_flag for LDFLAGS option which is not
-	  limited to particular platforms.  [ruby-core:41438] [Bug#5697]
-
 Thu Dec  1 23:21:58 2011  CHIKANAGA Tomoyuki  <nagachika00@g...>
 
 	* thread_pthread.c (thread_timer): call prctl(PR_SET_NAME) only if

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

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