[newlib-cygwin/main] libgloss: add per-file & per-dir flag support

Michael Frysinger vapier@sourceware.org
Sat Jan 20 01:26:20 GMT 2024


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

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

    libgloss: add per-file & per-dir flag support
    
    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 | 8 +++++++-
 libgloss/Makefile.in | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/libgloss/Makefile.am b/libgloss/Makefile.am
index a035f8d8a..ccfbfc167 100644
--- a/libgloss/Makefile.am
+++ b/libgloss/Makefile.am
@@ -24,7 +24,13 @@ includetool_DATA =
 includesystooldir = $(tooldir)/include/sys
 includesystool_DATA =
 
-AM_CPPFLAGS = -idirafter $(srcroot)/include
+# These are useful for standalone object files like crt0.o.
+AM_CFLAGS = $(AM_CFLAGS_$(subst /,_,$(@D))) $(AM_CFLAGS_$(subst /,_,$(@D)_$(<F)))
+AM_CCASFLAGS = $(AM_CCASFLAGS_$(subst /,_,$(@D))) $(AM_CCASFLAGS_$(subst /,_,$(@D)_$(<F)))
+AM_CPPFLAGS = $(AM_CPPFLAGS_$(subst /,_,$(@D))) $(AM_CPPFLAGS_$(subst /,_,$(@D)_$(<F)))
+AM_LDFLAGS = $(AM_LDFLAGS_$(subst /,_,$(@D))) $(AM_LDFLAGS_$(subst -,_,$(subst /,_,$(@D)_$(@F))))
+
+AM_CPPFLAGS += -idirafter $(srcroot)/include
 
 # 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 eff98872c..a085dcd9d 100644
--- a/libgloss/Makefile.in
+++ b/libgloss/Makefile.in
@@ -995,7 +995,13 @@ includetooldir = $(tooldir)/include
 includetool_DATA = $(am__append_16)
 includesystooldir = $(tooldir)/include/sys
 includesystool_DATA = $(am__append_17)
-AM_CPPFLAGS = -idirafter $(srcroot)/include
+
+# These are useful for standalone object files like crt0.o.
+AM_CFLAGS = $(AM_CFLAGS_$(subst /,_,$(@D))) $(AM_CFLAGS_$(subst /,_,$(@D)_$(<F)))
+AM_CCASFLAGS = $(AM_CCASFLAGS_$(subst /,_,$(@D))) $(AM_CCASFLAGS_$(subst /,_,$(@D)_$(<F)))
+AM_CPPFLAGS = $(AM_CPPFLAGS_$(subst /,_,$(@D))) $(AM_CPPFLAGS_$(subst \
+	/,_,$(@D)_$(<F))) -idirafter $(srcroot)/include
+AM_LDFLAGS = $(AM_LDFLAGS_$(subst /,_,$(@D))) $(AM_LDFLAGS_$(subst -,_,$(subst /,_,$(@D)_$(@F))))
 
 # A fake library so automake will generate rules for plain objects that we want
 # to install (e.g. our crt0.o objects).


More information about the Newlib-cvs mailing list