From fa156a1cad7de2cddce531526912995a1135108d Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Mon, 26 Jul 1999 12:45:03 +0000 Subject: [PATCH] * libtool.m4(cygwin mingw32, AC_LIBTOOL_SETUP): On second thoughts, only probe for -mdll vs -dll on mingw, and revert to the old `-Wl,--dll -nostartfiles' on cygwin. --- ChangeLog | 6 ++++++ libtool.m4 | 27 +++++++++++++-------------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6302aa6ea..7c68ff115 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +1999-07-26 Olly Betts + + * libtool.m4(cygwin mingw32, AC_LIBTOOL_SETUP): On second + thoughts, only probe for -mdll vs -dll on mingw, and revert to + the old `-Wl,--dll -nostartfiles' on cygwin. + 1999-07-24 Erez Zadok * doc/PLATFORMS (i*86-*openbsd2.5): New platform. diff --git a/libtool.m4 b/libtool.m4 index 3e3d533bd..1a5be173e 100644 --- a/libtool.m4 +++ b/libtool.m4 @@ -136,23 +136,22 @@ ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);], [lt_cv_need_dllmain=yes],[lt_cv_need_dllmain=no])]) - # old mingw systems require "-dll" to link a DLL, while more recent ones - # require "-mdll" - lt_nostartfiles= case $host in - *-*-cygwin) - # on cygwin we must also not link crt.o, or else the dll will need - # a WinMain@16 definition. - lt_nostartfiles=" -nostartfiles" ;; + *-*-cygwin*) + # cygwin systems need to tell pass --dll to the linker, and not link + # crt.o which will require a WinMain@16 definition. + lt_cv_cc_ddll_switch="-Wl,-dll -nostartfiles" ;; + *-*-mingw*) + # old mingw systems require "-dll" to link a DLL, while more recent ones + # require "-mdll" + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -mdll$lt_nostartfiles" + AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch, + [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])]) + CFLAGS="$SAVE_CFLAGS" ;; esac - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -mdll$lt_nostartfiles" - AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch, - [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])]) - lt_cv_cc_dll_switch="$lt_cv_cc_dll_switch$lt_nostartfiles" - CFLAGS="$SAVE_CFLAGS" ;; -]) + ]) esac ]) -- 2.47.3