configure: Assume that -delayload linker argument is supported when -target argument is used.

In practice, it's present only on clang and it always needs to be used there. mingw and msvc targets have different syntax. We take care of that in winegcc. Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

configure: Assume that -delayload linker argument is supported when -target argument is used.
3cae9288 · Jacek Caban · Alexandre Julliard · 053f07f6 · 3cae9288 · 3cae9288
Commit 3cae9288 authored May 05, 2020 by Jacek Caban Committed by Alexandre Julliard May 05, 2020
Expand all Show whitespace changes
Inline Side-by-side

Showing with 28 additions and 60 deletions

aclocal.m4 aclocal.m4 +1 -1

configure configure +26 -57

configure.ac configure.ac +1 -2

No files found.
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -165,7 +165,7 @@ ac_wine_try_cflags_saved_exeext=$ac_exeext
 CFLAGS="$CFLAGS $EXTRACROSSCFLAGS -nostartfiles -nodefaultlibs $1"
 CC="$CROSSCC"
 ac_exeext=".exe"
-AC_LINK_IFELSE([AC_LANG_SOURCE([[void __stdcall __delayLoadHelper2(void *descr, void *addr) {} int __cdecl mainCRTStartup(void) { return 0; }]])],
+AC_LINK_IFELSE([AC_LANG_SOURCE([[int __cdecl mainCRTStartup(void) { return 0; }]])],
               [AS_VAR_SET(ac_var,yes)], [AS_VAR_SET(ac_var,no)])
 CFLAGS=$ac_wine_try_cflags_saved
 CC=$ac_wine_try_cflags_saved_cc

--- a/configure
+++ b/configure
--- a/configure.ac
+++ b/configure.ac
@@ -1067,6 +1067,7 @@ then
            WINE_TRY_CROSSCFLAGS([-target $llvm_target -fuse-ld=lld],
                                 [CROSSTARGET=$llvm_target
                                  EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -target $CROSSTARGET"
+                                  AC_SUBST(DELAYLOADFLAG,["-Wl,-delayload,"])
                                  CFLAGS="$CFLAGS -fuse-ld=lld"])
        fi
        WINE_TRY_CROSSCFLAGS([-fno-strict-aliasing])
@@ -1103,8 +1104,6 @@ then
          esac
        done

-        WINE_TRY_CROSSCFLAGS([-Wl,-delayload,autoconftest.dll], [AC_SUBST(DELAYLOADFLAG,["-Wl,-delayload,"])])
-
        if test "x$enable_werror" = "xyes"
        then
            WINE_TRY_CROSSCFLAGS([-Werror])