Skip to content

Commit 52ad5a2

Browse files
authored
Fix Windows pipeline (#367)
1 parent 05cadd8 commit 52ad5a2

1 file changed

Lines changed: 6 additions & 11 deletions

File tree

configure.ac

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,15 @@ AS_CASE([$host],
5454
AC_SUBST([EXTRA_WARNINGS])
5555

5656
AS_CASE([$host],
57-
[*mingw*|*cygwin*], [EXTRA_LDFLAGS="$LTLIBICONV -no-undefined"],
58-
[EXTRA_LDFLAGS="$LTLIBICONV"])
57+
[*mingw*|*cygwin*], [EXTRA_LDFLAGS="-liconv -no-undefined"],
58+
[EXTRA_LDFLAGS=""])
5959
AC_SUBST([EXTRA_LDFLAGS])
6060

6161
AS_CASE([$host],
62-
[*mingw*],
63-
[
64-
#There is no real way to determine whether UCRT is used vs normal MINGW but one way is by checking a define in <windows.h>
65-
#If we are in UCRT we do not want to set the spawnv define because it breaks the build
66-
IS_UCRT=`echo '#include <windows.h>'| gcc -E -dM - | grep -i _UCRT | xargs`
67-
AS_IF([test "$IS_UCRT" == ""], [
68-
CFLAGS="$CFLAGS -D_spawnv=spawnv"
69-
])
70-
],
62+
[*mingw*],
63+
[
64+
AC_CHECK_FUNCS([_spawnv], [], [CFLAGS="$CFLAGS -D_spawnv=spawnv"])
65+
],
7166
[CFLAGS="$CFLAGS"])
7267

7368
AC_ARG_VAR([LIB_FUZZING_ENGINE], [Location of prebuilt fuzzing engine library])

0 commit comments

Comments
 (0)