diff options
| author | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-06-11 10:26:13 +0000 |
|---|---|---|
| committer | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-06-11 10:26:13 +0000 |
| commit | 7f80a1800f7b13e63227fb6202bee55a81cd506b (patch) | |
| tree | 496113b37257388826e3f424239daa1271da64c0 /configure.in | |
| parent | 65caf01223b8bdd538d52d3075573a9a2f006741 (diff) | |
* configure.in (LIBRUBY): rename to lib$(LIBRUBY_SO).a on Cygwin/MinGW.
* configure.in, cygwin/GNUmakefile: use dllwrap when --disable-shared
is specified.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2551 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/configure.in b/configure.in index dfe138e7f6..08739d5926 100644 --- a/configure.in +++ b/configure.in @@ -104,6 +104,7 @@ case "$target_os" in cygwin*|mingw*) AC_CHECK_TOOL(NM, nm) AC_CHECK_TOOL(WINDRES, windres) + AC_CHECK_TOOL(DLLWRAP, dllwrap) target_cpu=`echo $target_cpu | sed s/i.86/i386/` : ${enable_shared=yes} ;; @@ -1044,13 +1045,14 @@ case "$target_os" in if test x"$enable_shared" = xyes; then LIBRUBY_SO='$(RUBY_SO_NAME)'.dll LIBRUBY_DLDFLAGS='-Wl,--out-implib=$(LIBRUBY) $(RUBYDEF)' + LIBRUBY='lib$(LIBRUBY_SO).a' else LIBRUBY_SO=dummy - LIBRUBY_DLDFLAGS='-Wl,--output-exp=$(RUBY_INSTALL_NAME).exp,--out-implib=$(LIBRUBY) $(RUBYDEF)' + LIBRUBY_DLDFLAGS='' + LIBRUBY='lib$(RUBY_SO_NAME).a' fi LIBRUBY_ALIASES='' LIBRUBY_A='lib$(RUBY_INSTALL_NAME)s.a' - LIBRUBY='lib$(RUBY_SO_NAME).a' LIBRUBYARG='-L. -l$(RUBY_SO_NAME)' FIRSTMAKEFILE=GNUmakefile:cygwin/GNUmakefile.in SOLIBS='$(LIBS)' |