From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 81D633858430; Thu, 19 Jan 2023 17:30:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 81D633858430 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674149423; bh=R5lwQyLU8nD7OXKbxKekxmQLhfTxazHhscaRqoMOvyA=; h=From:To:Subject:Date:From; b=Ay2E9+lbebw9P5+FgHnIxgXkGBL6aM7iIbeal8LwJnm2+5zcqTq4isI1LZcRdHPiL tGlMt0BvhHIWIgFyJ6O3I39fapWpGDra4b5sPmwQpjxylZ6RQeP4EKttY8JY/9ikAa ck8KsWbwbTmsrAukf0fedJ1mX6UEaL7HmqXx0qGA= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin/main] Cygwin: fix build of cygcheck and strace X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/main X-Git-Oldrev: 9522166db1d2a8c551652d7f17ab3ff692cc4d19 X-Git-Newrev: 1d4110e347ad75e09e8ed2e362c1af3b92346656 Message-Id: <20230119173023.81D633858430@sourceware.org> Date: Thu, 19 Jan 2023 17:30:23 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D1d4110e347a= d75e09e8ed2e362c1af3b92346656 commit 1d4110e347ad75e09e8ed2e362c1af3b92346656 Author: Corinna Vinschen AuthorDate: Thu Jan 19 18:24:15 2023 +0100 Commit: Corinna Vinschen CommitDate: Thu Jan 19 18:28:16 2023 +0100 Cygwin: fix build of cygcheck and strace =20 adding _LDFLAGS overrides AM_LDFLAGS and thus fails to build cygcheck and strace statically. Fix it. =20 Fixes: 8d318bf142f7 ("Cygwin: disable high-entropy VA for cygcheck and = strace") Signed-off-by: Corinna Vinschen 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 =3D \ dump_setup.cc \ path.cc cygcheck_CPPFLAGS=3D-I$(srcdir)/.. -idirafter ${top_srcdir}/cygwin/include -cygcheck_LDFLAGS =3D -Wl,--disable-high-entropy-va +cygcheck_LDFLAGS =3D ${AM_LDFLAGS} -Wl,--disable-high-entropy-va cygcheck_LDADD =3D -lz -lwininet -lpsapi -lntdll =20 cygwin_console_helper_SOURCES =3D cygwin-console-helper.cc @@ -43,7 +43,7 @@ strace_SOURCES =3D \ path.cc \ strace.cc strace_CPPFLAGS=3D-I$(srcdir)/.. -idirafter ${top_srcdir}/cygwin/local_inc= ludes -idirafter ${top_srcdir}/cygwin/include -strace_LDFLAGS =3D -Wl,--disable-high-entropy-va +strace_LDFLAGS =3D ${AM_LDFLAGS} -Wl,--disable-high-entropy-va strace_LDADD =3D -lntdll =20 noinst_PROGRAMS =3D path-testsuite