summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.in6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 14b92b7d2d3..db993fe9867 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jul 26 10:09:01 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
+
+ * configure.in: set SOLIBS to LIBS on Cygwin.
+
Tue Jul 25 19:03:04 2000 WATANABE Hirofumi <eban@os.rim.or.jp>
* cygwin/GNUmakefile: use puts instead of print, because
diff --git a/configure.in b/configure.in
index f7fa8a9ad6e..8ec9bed5cc1 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
;;
*)