Fix _newlib_version.h logic to support building gcc with newlib.

This commit is contained in:
Jeff Johnston 2016-02-25 15:04:19 -05:00
parent 8b1ede3ce1
commit b8a88d0b04
4 changed files with 11 additions and 4 deletions

View File

@ -214,8 +214,7 @@ stmp-targ-include: config.status
-rm -rf targ-include stmp-targ-include -rm -rf targ-include stmp-targ-include
$(MAKE) targ-include/sys \ $(MAKE) targ-include/sys \
targ-include/machine \ targ-include/machine \
targ-include/bits \ targ-include/bits
targ-include/newlib.h
-for i in $(srcdir)/libc/machine/$(machine_dir)/machine/*.h; do \ -for i in $(srcdir)/libc/machine/$(machine_dir)/machine/*.h; do \
if [ -f $$i ]; then \ if [ -f $$i ]; then \
cp $$i targ-include/machine/`basename $$i`; \ cp $$i targ-include/machine/`basename $$i`; \
@ -271,6 +270,7 @@ stmp-targ-include: config.status
cp $$i targ-include/machine/`basename $$i`; \ cp $$i targ-include/machine/`basename $$i`; \
else true; fi ; \ else true; fi ; \
done done
$(MAKE) targ-include/newlib.h
touch $@ touch $@
CLEANFILES = stmp-targ-include CLEANFILES = stmp-targ-include

View File

@ -973,8 +973,7 @@ stmp-targ-include: config.status
-rm -rf targ-include stmp-targ-include -rm -rf targ-include stmp-targ-include
$(MAKE) targ-include/sys \ $(MAKE) targ-include/sys \
targ-include/machine \ targ-include/machine \
targ-include/bits \ targ-include/bits
targ-include/newlib.h
-for i in $(srcdir)/libc/machine/$(machine_dir)/machine/*.h; do \ -for i in $(srcdir)/libc/machine/$(machine_dir)/machine/*.h; do \
if [ -f $$i ]; then \ if [ -f $$i ]; then \
cp $$i targ-include/machine/`basename $$i`; \ cp $$i targ-include/machine/`basename $$i`; \
@ -1030,6 +1029,7 @@ stmp-targ-include: config.status
cp $$i targ-include/machine/`basename $$i`; \ cp $$i targ-include/machine/`basename $$i`; \
else true; fi ; \ else true; fi ; \
done done
$(MAKE) targ-include/newlib.h
touch $@ touch $@
install-data-local: install-toollibLIBRARIES install-data-local: install-toollibLIBRARIES

5
newlib/aclocal.m4 vendored
View File

@ -1009,4 +1009,9 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar]) AC_SUBST([am__untar])
]) # _AM_PROG_TAR ]) # _AM_PROG_TAR
m4_include([../libtool.m4])
m4_include([../ltoptions.m4])
m4_include([../ltsugar.m4])
m4_include([../ltversion.m4])
m4_include([../lt~obsolete.m4])
m4_include([acinclude.m4]) m4_include([acinclude.m4])

View File

@ -0,0 +1,2 @@
/* dummy file for external tools to use. Real file is created by
newlib configuration. */