diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-24 02:04:27 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-24 02:04:27 +0000 |
| commit | d3298468d0844594d07b3a6581b723b648d37dbd (patch) | |
| tree | 7343a49ad3ed87b1d557bf7e2bf686ec3bd79f72 | |
| parent | 20442b9c4496ee2f0f988f3a58917259e959ea0e (diff) | |
| download | ruby-d3298468d0844594d07b3a6581b723b648d37dbd.tar.gz | |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40907 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.in | 3 |
2 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Fri May 24 11:04:00 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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@atdot.net> * object.c (rb_obj_clone): should not propagate OLDGEN status. diff --git a/configure.in b/configure.in index 6f559d6395..43ab0ac324 100644 --- a/configure.in +++ b/configure.in @@ -3100,7 +3100,8 @@ AS_CASE("$enable_shared", [yes], [ ]) 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 |