From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 5027B3858C62; Thu, 19 Jan 2023 18:39:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5027B3858C62 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674153587; bh=H9ygrfDnRKyvlcdPleCHFZA7jmTfKedOmiLEvTzh2gU=; h=From:To:Subject:Date:From; b=eCxP2Co4LkkcnnKhmy6tojWFjhP6WTJynmwyCY+Qi1ofJXtKqPh6f7N0aAuAOUWje gA/Bge9clh7Q0+AVNOKRqIBUoHzDPrA6XO8PMLFv8TAkN4nfl7tfW/27/IIxYmMeyi RUcBkJ4rzDo+VoLAX+zxn1lfUkf+DBVTgMLKJfsc= 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/cygwin-3_4-branch] Cygwin: fix build of cygcheck and strace X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/cygwin-3_4-branch X-Git-Oldrev: 079974eb7ca7b7b11fbd91eeafffcbf61ce0d6e0 X-Git-Newrev: 51ea142bba9f40979c28718e13be44b871486ed2 Message-Id: <20230119183947.5027B3858C62@sourceware.org> Date: Thu, 19 Jan 2023 18:39:47 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D51ea142bba9= f40979c28718e13be44b871486ed2 commit 51ea142bba9f40979c28718e13be44b871486ed2 Author: Corinna Vinschen AuthorDate: Thu Jan 19 18:24:15 2023 +0100 Commit: Corinna Vinschen CommitDate: Thu Jan 19 18:24:15 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