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

commit 1d4110e347ad75e09e8ed2e362c1af3b92346656
Author:     Corinna Vinschen <[email protected]>
AuthorDate: Thu Jan 19 18:24:15 2023 +0100
Commit:     Corinna Vinschen <[email protected]>
CommitDate: Thu Jan 19 18:28:16 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 <[email protected]>

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

Reply via email to