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

ruby-changes:28855

From: nobu <ko1@a...>
Date: Fri, 24 May 2013 11:04:40 +0900 (JST)
Subject: [ruby-changes:28855] nobu:r40907 (trunk): configure.in: no runtime path to -L

nobu	2013-05-24 11:04:27 +0900 (Fri, 24 May 2013)

  New Revision: 40907

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

  Log:
    configure.in: no runtime path to -L
    
    * configure.in (LIBRUBY_RPATHFLAGS): do not append -L option with
      runtime library directory if cross compiling, but only -R option.
      runtime path makes no sense on the host system.  [ruby-dev:47363]
      [Bug #8443]

  Modified files:
    trunk/ChangeLog
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 40906)
+++ configure.in	(revision 40907)
@@ -3100,7 +3100,8 @@ AS_CASE("$enable_shared", [yes], [ https://github.com/ruby/ruby/blob/trunk/configure.in#L3100
 ])
 if test "$enable_rpath" = yes; then
     test -z "$LIBRUBY_RPATHFLAGS" || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS "
-    LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${linker_flag}-R ${linker_flag}${libprefix} -L${libprefix}"
+    LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${linker_flag}-R ${linker_flag}${libprefix}"
+    test "x$cross_compiling" = xyes || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS -L${libprefix}"
     LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
     LIBRUBYARG_STATIC="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_STATIC"
 fi
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 40906)
+++ ChangeLog	(revision 40907)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Fri May 24 11:04:00 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (LIBRUBY_RPATHFLAGS): do not append -L option with
+	  runtime library directory if cross compiling, but only -R option.
+	  runtime path makes no sense on the host system.  [ruby-dev:47363]
+	  [Bug #8443]
+
 Fri May 24 02:57:17 2013  Koichi Sasada  <ko1@a...>
 
 	* object.c (rb_obj_clone): should not propagate OLDGEN status.

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

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