[newlib-cygwin/cygwin-3_4-branch] Cygwin: fix build of cygcheck and strace

Corinna Vinschen corinna@sourceware.org
Thu Jan 19 18:39:47 GMT 2023


https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=51ea142bba9f40979c28718e13be44b871486ed2

commit 51ea142bba9f40979c28718e13be44b871486ed2
Author:     Corinna Vinschen <corinna@vinschen.de>
AuthorDate: Thu Jan 19 18:24:15 2023 +0100
Commit:     Corinna Vinschen <corinna@vinschen.de>
CommitDate: Thu Jan 19 18:24:15 2023 +0100

    Cygwin: fix build of cygcheck and strace
    
    adding <target>_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 <corinna@vinschen.de>

Diff:
---
 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 edb314d068be..c26eef80f8c0 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


More information about the Cygwin-cvs mailing list