public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin/cygwin-3_4-branch] Cygwin: fix build of cygcheck and strace
Date: Thu, 19 Jan 2023 18:39:47 +0000 (GMT)	[thread overview]
Message-ID: <20230119183947.5027B3858C62@sourceware.org> (raw)

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

                 reply	other threads:[~2023-01-19 18:39 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230119183947.5027B3858C62@sourceware.org \
    --to=corinna@sourceware.org \
    --cc=cygwin-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).