From ed3ac5c97dbb3362e4a7e1d6a0c3102d6953a925 Mon Sep 17 00:00:00 2001 From: eban Date: Wed, 26 Jul 2000 01:12:31 +0000 Subject: eban git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@854 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ configure.in | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 14b92b7d2..db993fe98 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Jul 26 10:09:01 2000 WATANABE Hirofumi + + * configure.in: set SOLIBS to LIBS on Cygwin. + Tue Jul 25 19:03:04 2000 WATANABE Hirofumi * cygwin/GNUmakefile: use puts instead of print, because diff --git a/configure.in b/configure.in index f7fa8a9ad..8ec9bed5c 100644 --- a/configure.in +++ b/configure.in @@ -828,7 +828,7 @@ case "$target_os" in LIBRUBY_SO='$(RUBY_INSTALL_NAME)-'$target_os.dll LIBRUBY_DLDFLAGS='--dllname=$@ --output-lib=$(LIBRUBY) --add-stdcall-alias --def=$(RUBYDEF)' else - LIBRUBY_SO=nul + LIBRUBY_SO=dummy LIBRUBY_DLDFLAGS='--output-exp=$(RUBY_INSTALL_NAME).exp --dllname=$(RUBY_INSTALL_NAME)$(EXEEXT) --output-lib=$(LIBRUBY) --add-stdcall-alias --def=$(RUBYDEF)' fi LIBRUBY_ALIASES='' @@ -836,6 +836,7 @@ case "$target_os" in LIBRUBY='lib$(RUBY_INSTALL_NAME).a' LIBRUBYARG='-L. -l$(RUBY_INSTALL_NAME)' FIRSTMAKEFILE=GNUmakefile:cygwin/GNUmakefile.in + SOLIBS='$(LIBS)' case "$target_os" in cygwin*) LIBOBJS="$LIBOBJS strftime.o" @@ -843,8 +844,7 @@ case "$target_os" in mingw*) LIBOBJS="$LIBOBJS win32.o" CFLAGS="-DNT -D__MSVCRT__ $CFLAGS" - CCDLFLAGS=-DIMPORT - SOLIBS='$(LIBS)' ;; + CCDLFLAGS=-DIMPORT ;; esac ;; *) -- cgit