1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* configure.in (GNU/k*BSD): fixed FTBFS on GNU/k*BSD. [ruby-dev:24051]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6834 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
eban 2004-08-30 06:16:29 +00:00
parent 2ca3c51719
commit 2ebfc7e328
2 changed files with 9 additions and 13 deletions

View file

@ -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]
Sun Aug 29 14:08:56 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> Sun Aug 29 14:08:56 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tcltklib/tcltklib.c: compile error on bcc32 [ruby-dev:24081] * ext/tcltklib/tcltklib.c: compile error on bcc32 [ruby-dev:24081]

View file

@ -792,7 +792,7 @@ if test "$rb_cv_binary_elf" = yes; then
fi fi
case "$target_os" in case "$target_os" in
linux*) linux* | gnu* | k*bsd*-gnu)
if test "$rb_cv_binary_elf" = no; then if test "$rb_cv_binary_elf" = no; then
with_dln_a_out=yes with_dln_a_out=yes
else else
@ -873,15 +873,13 @@ if test "$with_dln_a_out" != yes; then
rb_cv_dlopen=yes ;; rb_cv_dlopen=yes ;;
osf*) : ${LDSHARED="ld -shared -expect_unresolved \"*\""} osf*) : ${LDSHARED="ld -shared -expect_unresolved \"*\""}
rb_cv_dlopen=yes ;; rb_cv_dlopen=yes ;;
linux*) : ${LDSHARED="$CC -shared"} linux* | gnu* | k*bsd*-gnu)
: ${LDSHARED="$CC -shared"}
rb_cv_dlopen=yes ;; rb_cv_dlopen=yes ;;
interix*) : ${LDSHARED="$CC -shared"} interix*) : ${LDSHARED="$CC -shared"}
XLDFLAGS="$XLDFLAGS -Wl,-E" XLDFLAGS="$XLDFLAGS -Wl,-E"
LIBPATHFLAG=" -L'%1\$-s'" LIBPATHFLAG=" -L'%1\$-s'"
rb_cv_dlopen=yes ;; rb_cv_dlopen=yes ;;
gnu*) : ${LDSHARED="$CC -shared"}
rb_cv_dlopen=yes
LDFLAGS="$LDFLAGS -rdynamic" ;;
freebsd*|dragonfly*) : ${LDSHARED="$CC -shared"} freebsd*|dragonfly*) : ${LDSHARED="$CC -shared"}
if test "$rb_cv_binary_elf" = yes; then if test "$rb_cv_binary_elf" = yes; then
LDFLAGS="$LDFLAGS -rdynamic" LDFLAGS="$LDFLAGS -rdynamic"
@ -1031,9 +1029,7 @@ else
fi fi
case "$target_os" in case "$target_os" in
linux*) linux* | gnu* | k*bsd*-gnu)
STRIP='strip -S -x';;
gnu*)
STRIP='strip -S -x';; STRIP='strip -S -x';;
nextstep*) nextstep*)
STRIP='strip -A -n';; STRIP='strip -A -n';;
@ -1179,11 +1175,7 @@ if test "$enable_shared" = 'yes'; then
sunos4*) sunos4*)
LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so' LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
;; ;;
linux*) 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'
;;
gnu*)
LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)' 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' LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
;; ;;