From: Jonathan Wakely Date: Fri, 1 Mar 2024 11:20:51 +0000 (+0000) Subject: libstdc++: Regenerate in maintainer mode X-Git-Tag: basepoints/gcc-15~590 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90788dd722346560d410fe9a5c2d543811027336;p=thirdparty%2Fgcc.git libstdc++: Regenerate in maintainer mode This is a generated header but regenerating it requires the manual step of running 'make -C include update-version' in the libstdc++ build dir. Make it regenerate automatically when --enable-maintainer-mode is used. libstdc++-v3/ChangeLog: * include/Makefile.am [MAINTAINER_MODE]: Add target to automatically update . * include/Makefile.in: Regenerate. gcc/ChangeLog: * doc/install.texi (Prerequisites): Document use of autogen for libstdc++. --- diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi index e3650e0c4f49..014ca25aa628 100644 --- a/gcc/doc/install.texi +++ b/gcc/doc/install.texi @@ -545,6 +545,8 @@ Necessary to run @samp{make check} for @file{fixinc}. Necessary to regenerate the top level @file{Makefile.in} file from @file{Makefile.tpl} and @file{Makefile.def}. +Necessary to regenerate the @file{bits/version.h} header for libstdc++. + @item Flex version 2.5.4 (or later) Necessary when modifying @file{*.l} files. diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index 64152351ed0c..cb902de36aed 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -1480,6 +1480,12 @@ update-version: cd ${bits_srcdir} && \ autogen version.def +if MAINTAINER_MODE +# Regenerate it automatically in maintainer mode. +${bits_srcdir}/version.h: ${bits_srcdir}/version.def ${bits_srcdir}/version.tpl + $(MAKE) update-version +endif + # The real deal. install-data-local: install-headers install-headers: diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index 5a965c8e03bf..9357087acb4d 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -1954,6 +1954,10 @@ update-version: cd ${bits_srcdir} && \ autogen version.def +# Regenerate it automatically in maintainer mode. +@MAINTAINER_MODE_TRUE@${bits_srcdir}/version.h: ${bits_srcdir}/version.def ${bits_srcdir}/version.tpl +@MAINTAINER_MODE_TRUE@ $(MAKE) update-version + # The real deal. install-data-local: install-headers install-headers: