From 1d4110e347ad75e09e8ed2e362c1af3b92346656 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Thu, 19 Jan 2023 18:24:15 +0100 Subject: [PATCH] Cygwin: fix build of cygcheck and strace adding _LDFLAGS overrides AM_LDFLAGS and thus fails to build cygcheck and strace statically. Fix it. Fixes: 8d318bf142f7 ("Cygwin: disable high-entropy VA for cygcheck and strace") Signed-off-by: Corinna Vinschen --- winsup/utils/mingw/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/winsup/utils/mingw/Makefile.am b/winsup/utils/mingw/Makefile.am index edb314d06..c26eef80f 100644 --- a/winsup/utils/mingw/Makefile.am +++ b/winsup/utils/mingw/Makefile.am @@ -32,7 +32,7 @@ cygcheck_SOURCES = \ dump_setup.cc \ path.cc cygcheck_CPPFLAGS=-I$(srcdir)/.. -idirafter ${top_srcdir}/cygwin/include -cygcheck_LDFLAGS = -Wl,--disable-high-entropy-va +cygcheck_LDFLAGS = ${AM_LDFLAGS} -Wl,--disable-high-entropy-va cygcheck_LDADD = -lz -lwininet -lpsapi -lntdll cygwin_console_helper_SOURCES = cygwin-console-helper.cc @@ -43,7 +43,7 @@ strace_SOURCES = \ path.cc \ strace.cc strace_CPPFLAGS=-I$(srcdir)/.. -idirafter ${top_srcdir}/cygwin/local_includes -idirafter ${top_srcdir}/cygwin/include -strace_LDFLAGS = -Wl,--disable-high-entropy-va +strace_LDFLAGS = ${AM_LDFLAGS} -Wl,--disable-high-entropy-va strace_LDADD = -lntdll noinst_PROGRAMS = path-testsuite -- 2.43.5