libiberty is needed for mingw, and useable under cygwin.

This commit is contained in:
steve 2001-10-14 19:54:05 +00:00
parent ad44b411fb
commit a7054a91e5
3 changed files with 5 additions and 9 deletions

View File

@ -16,7 +16,7 @@
# 59 Temple Place - Suite 330 # 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA # Boston, MA 02111-1307, USA
# #
#ident "$Id: Makefile.in,v 1.104 2001/09/20 03:21:01 steve Exp $" #ident "$Id: Makefile.in,v 1.105 2001/10/14 19:54:05 steve Exp $"
# #
# #
SHELL = /bin/sh SHELL = /bin/sh
@ -145,12 +145,12 @@ vpithunk.o: vpithunk.c
ifeq (@WIN32@,yes) ifeq (@WIN32@,yes)
ivl@EXEEXT@: $O ivl.def ivl@EXEEXT@: $O ivl.def
$(CXX) -o ivl@EXEEXT@ ivl.exp $O $(dllib) @EXTRALIBS@
dlltool --dllname ivl@EXEEXT@ --def ivl.def \ dlltool --dllname ivl@EXEEXT@ --def ivl.def \
--output-lib libivl.a --output-exp ivl.exp --output-lib libivl.a --output-exp ivl.exp
# $(CXX) -o ivl@EXEEXT@ -Wl,--base-file,ivl.base ivl.exp $O $(dllib) # $(CXX) -o ivl@EXEEXT@ -Wl,--base-file,ivl.base ivl.exp $O $(dllib)
# dlltool --dllname ivl@EXEEXT@ --base-file ivl.base \ # dlltool --dllname ivl@EXEEXT@ --base-file ivl.base \
# --output-exp ivl.exp --def ivl.def # --output-exp ivl.exp --def ivl.def
$(CXX) -o ivl@EXEEXT@ ivl.exp $O $(dllib) @EXTRALIBS@
else else
ivl@EXEEXT@: $O ivl@EXEEXT@: $O
$(CXX) $(CXXFLAGS) $(rdynamic) $(LDFLAGS) -o ivl@EXEEXT@ $O $(dllib) $(CXX) $(CXXFLAGS) $(rdynamic) $(LDFLAGS) -o ivl@EXEEXT@ $O $(dllib)

View File

@ -138,15 +138,13 @@ AC_SUBST(PICFLAG)
AC_MSG_RESULT($PICFLAG) AC_MSG_RESULT($PICFLAG)
# mingw needs to link with libiberty.a # mingw needs to link with libiberty.a, cygwin can tolerate it
AC_MSG_CHECKING("for extra libs needed") AC_MSG_CHECKING("for extra libs needed")
EXTRALIBS= EXTRALIBS=
case "${host}" in case "${host}" in
*-*-cygwin*) *-*-cygwin*)
if test $ac_cv_mingw32 = yes; then
EXTRALIBS="-liberty" EXTRALIBS="-liberty"
fi
;; ;;
esac esac
AC_SUBST(EXTRALIBS) AC_SUBST(EXTRALIBS)

View File

@ -90,9 +90,7 @@ AC_MSG_CHECKING("for extra libs needed")
EXTRALIBS= EXTRALIBS=
case "${host}" in case "${host}" in
*-*-cygwin*) *-*-cygwin*)
if test $ac_cv_mingw32 = yes; then
EXTRALIBS="-liberty" EXTRALIBS="-liberty"
fi
;; ;;
esac esac
AC_SUBST(EXTRALIBS) AC_SUBST(EXTRALIBS)