| 10,37 → 10,9 |
|---|
| - if test x$LINKING != xno -a "x$RPATH" != x ; then |
| - LDOPTS="$LDOPTS -Wl,-rpath,$RPATH" |
| - fi |
| + Linux\ 2.*|Linux\ 3.*) |
| + Linux\ *) |
| + LD_LIBRARY_PATH="$RPATH" |
| + export LD_LIBRARY_PATH |
| ;; |
| UnixWare\ 7.*) |
| if test x$LINKING != xno -a "x$RPATH" != x ; then |
| --- a/src/smartlink.c |
| +++ b/src/smartlink.c |
| @@ -160,7 +160,7 @@ int main(int argc, char **argv) |
| full_rpath = rpath; |
| |
| #ifdef USE_Wl |
| - strcat(rpath, "-Wl,-rpath,"); |
| + /* strcat(rpath, "-Wl,-rpath,"); */ |
| #elif defined(USE_Wl_R) |
| strcat(rpath, "-Wl,-R"); |
| #elif defined(USE_R) |
| @@ -310,7 +310,7 @@ int main(int argc, char **argv) |
| } |
| rpath_in_use |= add_path(rpath, ld_lib_path); |
| } |
| - |
| +#if 0 |
| if (rpath_in_use) { |
| /* Delete the terminating ':' */ |
| rpath[strlen(rpath) - 1] = 0; |
| @@ -357,6 +357,7 @@ int main(int argc, char **argv) |
| #error Unknown method |
| #endif |
| } |
| +#endif |
| |
| new_argv[new_argc++] = NULL; |
| |