diff options
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/configure.in b/configure.in index a37e8e981c..e9fcc2fb24 100644 --- a/configure.in +++ b/configure.in @@ -509,7 +509,7 @@ AC_CHECK_FUNCS(fmod killpg wait4 waitpid fork spawnv syscall chroot fsync getcwd getpgrp setpgrp getpgid setpgid initgroups getgroups setgroups\ getpriority getrlimit setrlimit\ dlopen sigprocmask sigaction _setjmp vsnprintf snprintf\ - setsid telldir seekdir fchmod mktime timegm cosh sinh tanh\ + setsid telldir seekdir fchmod mktime timegm cosh sinh tanh log2\ setuid setgid daemon select_large_fdset setenv unsetenv) AC_ARG_ENABLE(setreuid, [ --enable-setreuid use setreuid()/setregid() according to need even if obsolete.], @@ -1265,8 +1265,6 @@ if test "$enable_shared" = 'yes'; then LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY) lib$(RUBY_SO_NAME).so' if test "$GCC" = yes; then LIBRUBY_DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(@F)' - else - enable_rpath=no fi XLDFLAGS="$XLDFLAGS "'-R${libdir}' ;; @@ -1307,7 +1305,11 @@ if test "$enable_shared" = 'yes'; then esac fi if test "$enable_rpath" = yes; then - LIBRUBYARG_SHARED='-Wl,-R -Wl,$(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED" + if test "$GCC" = yes; then + LIBRUBYARG_SHARED='-Wl,-R -Wl,$(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED" + else + LIBRUBYARG_SHARED='-R $(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED" + fi fi XLDFLAGS="$XLDFLAGS -L." |