[setup - the official Cygwin setup program] branch master, updated. release_2.930-2-gae72807d

[Jon Turney]

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=ae72807d3269b831c3fd9cea203b627d95c991ab

commit ae72807d3269b831c3fd9cea203b627d95c991ab
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Fri Feb 9 17:32:50 2024 +0000

    Don't use 'dlltool --output-delaylib' on 32-bit


Diff:
---
 Makefile.am  | 12 +++++++++++-
 configure.ac |  1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 03672ff5..8a50cb05 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -102,7 +102,17 @@ wininet-delaylib.a:
 
 CLEANFILES += wininet-delaylib.a
 
+# Unfortunately, the delay-loading stub lib doesn't work properly on 32-bit
+# currently, so don't bother (since we're probably going to stop building that
+# fairly soon)
+#
+# (See https://sourceware.org/bugzilla/show_bug.cgi?id=14339)
+if ARCH_X86
+WININET=-lwininet
+else
+WININET=wininet-delaylib.a
 EXTRA_@SETUP@_DEPENDENCIES=wininet-delaylib.a
+endif
 
 @SETUP@_LDADD = \
 	libgetopt++/libgetopt++.la \
@@ -113,7 +123,7 @@ EXTRA_@SETUP@_DEPENDENCIES=wininet-delaylib.a
 	$(ZLIB_LIBS) \
 	$(LIBSOLV_LIBS) -lregex \
 	-lmingwex \
-	-lshlwapi -lcomctl32 -lole32 -lpsapi -luuid -lntdll wininet-delaylib.a -lws2_32 \
+	-lshlwapi -lcomctl32 -lole32 -lpsapi -luuid -lntdll $(WININET) -lws2_32 \
 	-lmingw32 -lssp
 @SETUP@_LDFLAGS = -mwindows -Wc,-static -static-libtool-libs
 @SETUP@_SOURCES = \
diff --git a/configure.ac b/configure.ac
index 453d2736..5de367fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,6 +79,7 @@ x86_64-*-mingw32)
 esac
 AC_SUBST(SETUP)
 AC_SUBST(ARCH)
+AM_CONDITIONAL(ARCH_X86, [test "x$ARCH" = "xx86"])
 
 dnl check exception personality
 AC_MSG_CHECKING([compiler exception personality])