diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2023-02-09 16:59:31 -0500 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2023-02-22 14:53:05 -0500 |
| commit | 17ac400c11bab30ac2c0bef12cbf7788f0b6f954 (patch) | |
| tree | f64b33a564048dd2831f77501b2f0c266e9eff84 /newlib | |
| parent | 97d483c2f81c0865bead701f4d2824a21fae4938 (diff) | |
| download | newlib-17ac400c11bab30ac2c0bef12cbf7788f0b6f954.zip newlib-17ac400c11bab30ac2c0bef12cbf7788f0b6f954.tar.gz newlib-17ac400c11bab30ac2c0bef12cbf7788f0b6f954.tar.bz2 | |
Fix libgloss/newlib build to conditionally use top include dir
- conditionally use -idirafter option for arm
Diffstat (limited to 'newlib')
| -rw-r--r-- | newlib/Makefile.am | 4 | ||||
| -rw-r--r-- | newlib/Makefile.in | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/newlib/Makefile.am b/newlib/Makefile.am index 3bebf27..a188845 100644 --- a/newlib/Makefile.am +++ b/newlib/Makefile.am @@ -70,7 +70,11 @@ toollibdir = $(tooldir)/lib$(MULTISUBDIR) # 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))) +if HAVE_LIBC_MACHINE_ARM AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS) $(AM_CPPFLAGS_$(subst /,_,$(@D))) $(AM_CPPFLAGS_$(subst /,_,$(@D)_$(<F))) -idirafter $(srcroot)/include +else +AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS) $(AM_CPPFLAGS_$(subst /,_,$(@D))) $(AM_CPPFLAGS_$(subst /,_,$(@D)_$(<F))) +endif toollib_LIBRARIES = libm.a \ libc.a diff --git a/newlib/Makefile.in b/newlib/Makefile.in index bc967bd..b168577 100644 --- a/newlib/Makefile.in +++ b/newlib/Makefile.in @@ -3848,7 +3848,8 @@ toollibdir = $(tooldir)/lib$(MULTISUBDIR) # 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 = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS) $(AM_CPPFLAGS_$(subst /,_,$(@D))) $(AM_CPPFLAGS_$(subst /,_,$(@D)_$(<F))) -idirafter $(srcroot)/include +@HAVE_LIBC_MACHINE_ARM_FALSE@AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS) $(AM_CPPFLAGS_$(subst /,_,$(@D))) $(AM_CPPFLAGS_$(subst /,_,$(@D)_$(<F))) +@HAVE_LIBC_MACHINE_ARM_TRUE@AM_CPPFLAGS = $(NEWLIB_CFLAGS) $(TARGET_CFLAGS) $(AM_CPPFLAGS_$(subst /,_,$(@D))) $(AM_CPPFLAGS_$(subst /,_,$(@D)_$(<F))) -idirafter $(srcroot)/include toollib_LIBRARIES = libm.a libc.a $(am__append_72) @HAVE_MULTISUBDIR_TRUE@BUILD_MULTISUBDIR = $(builddir)$(MULTISUBDIR) toollib_DATA = $(CRT0) $(CRT1) |