diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 18 |
2 files changed, 9 insertions, 13 deletions
@@ -1,3 +1,7 @@ +Mon Aug 30 15:10:46 2004 WATANABE Hirofumi <eban@ruby-lang.org> + + * configure.in (GNU/k*BSD): fixed FTBFS on GNU/k*BSD. [ruby-dev:24051] + Mon Aug 30 11:29:35 2004 NAKAMURA Usaku <usa@ruby-lang.org> * win32/win32.c (CreateChild): strip trailing spaces. [ruby-dev:24143] diff --git a/configure.in b/configure.in index 84f8e608fe..5a6374ea0a 100644 --- a/configure.in +++ b/configure.in @@ -776,7 +776,7 @@ if test "$rb_cv_binary_elf" = yes; then fi case "$target_os" in -linux*) +linux* | gnu* | k*bsd*-gnu) if test "$rb_cv_binary_elf" = no; then with_dln_a_out=yes else @@ -856,15 +856,13 @@ if test "$with_dln_a_out" != yes; then rb_cv_dlopen=yes ;; osf*) : ${LDSHARED="ld -shared -expect_unresolved \"*\""} rb_cv_dlopen=yes ;; - linux*) : ${LDSHARED="$CC -shared"} + linux* | gnu* | k*bsd*-gnu) + : ${LDSHARED="$CC -shared"} rb_cv_dlopen=yes ;; interix*) : ${LDSHARED="$CC -shared"} XLDFLAGS="$XLDFLAGS -Wl,-E" LIBPATHFLAG=" -L'%1\$-s'" rb_cv_dlopen=yes ;; - gnu*) : ${LDSHARED="$CC -shared"} - rb_cv_dlopen=yes - LDFLAGS="$LDFLAGS -rdynamic" ;; freebsd*|dragonfly*) : ${LDSHARED="$CC -shared"} if test "$rb_cv_binary_elf" = yes; then LDFLAGS="$LDFLAGS -rdynamic" @@ -1011,9 +1009,7 @@ else fi case "$target_os" in - linux*) - STRIP='strip -S -x';; - gnu*) + linux* | gnu* | k*bsd*-gnu) STRIP='strip -S -x';; nextstep*) STRIP='strip -A -n';; @@ -1156,11 +1152,7 @@ if test "$enable_shared" = 'yes'; then sunos4*) LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so' ;; - linux*) - LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)' - LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so' - ;; - gnu*) + linux* | gnu* | k*bsd*-gnu) LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)' LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so' ;; |