This is the mail archive of the newlib-cvs@sourceware.org mailing list for the newlib project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[newlib-cygwin] Fix _newlib_version.h logic to support building gcc with newlib.


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

commit b8a88d0b04fbdee0d3437d3ddaaf2bf8f3ceb814
Author: Jeff Johnston <jjohnstn@redhat.com>
Date:   Thu Feb 25 15:04:19 2016 -0500

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

Diff:
---
 newlib/Makefile.am                    | 4 ++--
 newlib/Makefile.in                    | 4 ++--
 newlib/aclocal.m4                     | 5 +++++
 newlib/libc/include/_newlib_version.h | 2 ++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/newlib/Makefile.am b/newlib/Makefile.am
index 9b30cd3..200bc61 100644
--- a/newlib/Makefile.am
+++ b/newlib/Makefile.am
@@ -214,8 +214,7 @@ stmp-targ-include: config.status
 	-rm -rf targ-include stmp-targ-include
 	$(MAKE) targ-include/sys \
 		targ-include/machine \
-		targ-include/bits \
-		targ-include/newlib.h
+		targ-include/bits
 	-for i in $(srcdir)/libc/machine/$(machine_dir)/machine/*.h; do \
 	    if [ -f $$i ]; then \
 	      cp $$i targ-include/machine/`basename $$i`; \
@@ -271,6 +270,7 @@ stmp-targ-include: config.status
 	      cp $$i targ-include/machine/`basename $$i`; \
 	    else true; fi ; \
 	  done
+	$(MAKE) targ-include/newlib.h
 	touch $@
 
 CLEANFILES = stmp-targ-include
diff --git a/newlib/Makefile.in b/newlib/Makefile.in
index c235995..c4cc431 100644
--- a/newlib/Makefile.in
+++ b/newlib/Makefile.in
@@ -973,8 +973,7 @@ stmp-targ-include: config.status
 	-rm -rf targ-include stmp-targ-include
 	$(MAKE) targ-include/sys \
 		targ-include/machine \
-		targ-include/bits \
-		targ-include/newlib.h
+		targ-include/bits
 	-for i in $(srcdir)/libc/machine/$(machine_dir)/machine/*.h; do \
 	    if [ -f $$i ]; then \
 	      cp $$i targ-include/machine/`basename $$i`; \
@@ -1030,6 +1029,7 @@ stmp-targ-include: config.status
 	      cp $$i targ-include/machine/`basename $$i`; \
 	    else true; fi ; \
 	  done
+	$(MAKE) targ-include/newlib.h
 	touch $@
 
 install-data-local:	install-toollibLIBRARIES
diff --git a/newlib/aclocal.m4 b/newlib/aclocal.m4
index 27fd2b2..6d40f4c 100644
--- a/newlib/aclocal.m4
+++ b/newlib/aclocal.m4
@@ -1009,4 +1009,9 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _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])
diff --git a/newlib/libc/include/_newlib_version.h b/newlib/libc/include/_newlib_version.h
new file mode 100644
index 0000000..d4fffb1
--- /dev/null
+++ b/newlib/libc/include/_newlib_version.h
@@ -0,0 +1,2 @@
+/* dummy file for external tools to use.  Real file is created by
+   newlib configuration. */


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]