diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-21 00:51:11 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-21 00:51:11 +0000 |
| commit | 22b51faf7edad433d7528eef5c0f4bb55dedeb84 (patch) | |
| tree | cbc6a7143ce4c1f25f7db91f7b9259f0aad9b43b /configure.in | |
| parent | e908adc12a522d8e9ded0bf9b552f1335ac92c29 (diff) | |
| download | ruby-22b51faf7edad433d7528eef5c0f4bb55dedeb84.tar.gz | |
configure.in: libdir_basename for -rpath and -install_name
* configure.in (libdir_basename): also -rpath and -install_name flags
are affected when libruby directory changes. [Bug #7874]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39345 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 07dbc5ddb0..6b9d5f544b 100644 --- a/configure.in +++ b/configure.in @@ -2699,6 +2699,7 @@ AS_CASE("$enable_shared", [yes], [ AS_CASE(["$libdir"], ['${exec_prefix}/'*], [libdir_basename=`basename "$libdir"`]) fi AC_DEFINE_UNQUOTED(LIBDIR_BASENAME, ["${libdir_basename}"]) + AC_SUBST(libdir_basename) AS_CASE(["$target_os"], [freebsd*|dragonfly*], [], @@ -2719,7 +2720,7 @@ AS_CASE("$enable_shared", [yes], [ LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'" $LDFLAGS_OPTDIR" LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so' if test "$load_relative" = yes; then - LIBRUBY_RPATHFLAGS="'-Wl,-rpath,\$\${ORIGIN}/../${libdir_basename}'" + LIBRUBY_RPATHFLAGS="'-Wl,-rpath,\$\${ORIGIN}/../\${libdir_basename}'" LIBRUBY_RELATIVE=yes fi ], @@ -2776,7 +2777,7 @@ AS_CASE("$enable_shared", [yes], [ RUBY_SO_NAME="$RUBY_SO_NAME"'.$(MAJOR).$(MINOR).$(TEENY)' LIBRUBY_LDSHARED='$(CC) -dynamiclib' if test "$load_relative" = yes; then - libprefix="@executable_path/../${libdir_basename}" + libprefix='@executable_path/../${libdir_basename}' LIBRUBY_RELATIVE=yes fi LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-install_name '${libprefix}'/$(LIBRUBY_SO)' @@ -3236,6 +3237,9 @@ archlibdir='${libdir}/${arch}' sitearchlibdir='${libdir}/${sitearch}' archincludedir='${includedir}/${arch}' sitearchincludedir='${includedir}/${sitearch}' +if test ${libdir_basename+set}; then + libdir_basename="${libdir_basename}"${multiarch+'/${arch}'} +fi shvar_to_cpp() { local var="$1" val="$2" |