From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <vapier@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1521)
	id CCE9E3858437; Tue,  2 Jan 2024 04:35:44 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CCE9E3858437
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org;
	s=default; t=1704170144;
	bh=iJ7dbdpgIcYTBFtyQZgcOyjRB1R2/NiAanyNKciZJak=;
	h=From:To:Subject:Date:From;
	b=JjK1PTbuY9o8z5tlF2sDMIPJKgDjrAKDSMxQxOcN59Y8AyHAImKCIcYtv6E6ZusVi
	 jbXIuVw+2LLifyS/x6U0QVvVveXpFwiuWcWqnb+tu9w9/VkCmBqUVHH7P83uVMWgyI
	 9PLg93LXzJB3mKIvNZ6B6f6HDNnhZqkvnuTniNbI=
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
From: Michael Frysinger <vapier@sourceware.org>
To: newlib-cvs@sourceware.org
Subject: [newlib-cygwin/users/vapier/wip] libgloss: add per-file & per-dir flag support
X-Act-Checkin: newlib-cygwin
X-Git-Author: Mike Frysinger <vapier@gentoo.org>
X-Git-Refname: refs/heads/users/vapier/wip
X-Git-Oldrev: 6a1b0abc3d243f2524b738b990a85728d54bdbe9
X-Git-Newrev: 616db3e80ca4d49c138f2f9db49b3b81b40c4504
Message-Id: <20240102043544.CCE9E3858437@sourceware.org>
Date: Tue,  2 Jan 2024 04:35:44 +0000 (GMT)
List-Id: <newlib-cvs.sourceware.org>

https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D616db3e80ca=
4d49c138f2f9db49b3b81b40c4504

commit 616db3e80ca4d49c138f2f9db49b3b81b40c4504
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Fri Dec 29 20:34:38 2023 -0500

    libgloss: add per-file & per-dir flag support
   =20
    This logic is copied from what's used in newlib today.  This allows
    subdirs to easily define per-directory flags & per-file flags without
    having to setup unique automake rules for each one.

Diff:
---
 libgloss/Makefile.am | 6 +++++-
 libgloss/Makefile.in | 7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/libgloss/Makefile.am b/libgloss/Makefile.am
index aa1c430e3..9d6988ace 100644
--- a/libgloss/Makefile.am
+++ b/libgloss/Makefile.am
@@ -24,7 +24,11 @@ includetool_DATA =3D
 includesystooldir =3D $(tooldir)/include/sys
 includesystool_DATA =3D
=20
-AM_CPPFLAGS =3D -idirafter $(srcroot)/include
+# These are useful for standalone object files like crt0.o.
+AM_CFLAGS =3D $(AM_CFLAGS_$(subst /,_,$(@D))) $(AM_CFLAGS_$(subst /,_,$(@D=
)_$(<F)))
+AM_CCASFLAGS =3D $(AM_CCASFLAGS_$(subst /,_,$(@D))) $(AM_CCASFLAGS_$(subst=
 /,_,$(@D)_$(<F)))
+AM_CPPFLAGS =3D $(AM_CPPFLAGS_$(subst /,_,$(@D))) $(AM_CPPFLAGS_$(subst /,=
_,$(@D)_$(<F))) -idirafter $(srcroot)/include
+AM_LDFLAGS =3D $(AM_LDFLAGS_$(subst /,_,$(@D))) $(AM_LDFLAGS_$(subst -,_,$=
(subst /,_,$(@D)_$(@F))))
=20
 # A fake library so automake will generate rules for plain objects that we=
 want
 # to install (e.g. our crt0.o objects).
diff --git a/libgloss/Makefile.in b/libgloss/Makefile.in
index e6441a4c5..2574c7021 100644
--- a/libgloss/Makefile.in
+++ b/libgloss/Makefile.in
@@ -913,7 +913,12 @@ includetooldir =3D $(tooldir)/include
 includetool_DATA =3D $(am__append_16)
 includesystooldir =3D $(tooldir)/include/sys
 includesystool_DATA =3D $(am__append_17)
-AM_CPPFLAGS =3D -idirafter $(srcroot)/include
+
+# These are useful for standalone object files like crt0.o.
+AM_CFLAGS =3D $(AM_CFLAGS_$(subst /,_,$(@D))) $(AM_CFLAGS_$(subst /,_,$(@D=
)_$(<F)))
+AM_CCASFLAGS =3D $(AM_CCASFLAGS_$(subst /,_,$(@D))) $(AM_CCASFLAGS_$(subst=
 /,_,$(@D)_$(<F)))
+AM_CPPFLAGS =3D $(AM_CPPFLAGS_$(subst /,_,$(@D))) $(AM_CPPFLAGS_$(subst /,=
_,$(@D)_$(<F))) -idirafter $(srcroot)/include
+AM_LDFLAGS =3D $(AM_LDFLAGS_$(subst /,_,$(@D))) $(AM_LDFLAGS_$(subst -,_,$=
(subst /,_,$(@D)_$(@F))))
=20
 # A fake library so automake will generate rules for plain objects that we=
 want
 # to install (e.g. our crt0.o objects).