From 21fb1b461c29b61faf199ec2362ff9a53d6f01e6 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 17 Jan 2022 21:17:54 -0500 Subject: newlib: move version defines out of the config headers This will make it easier to move newlib.h to use autoheader directly. We only want the newlib version defines in our hand curated version file, _newlib_version.h, not in the template header, newlib.h, so using AC_DEFINE doesn't make much sense. --- newlib/configure.ac | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'newlib/configure.ac') diff --git a/newlib/configure.ac b/newlib/configure.ac index 35d94666a..e1fb2ad0e 100644 --- a/newlib/configure.ac +++ b/newlib/configure.ac @@ -477,10 +477,12 @@ if test "${newlib_mb}" = "yes"; then fi AC_DEFINE_UNQUOTED(_MB_LEN_MAX, $_mb_len_max, [Multibyte max length.]) -AC_DEFINE(_NEWLIB_VERSION, "NEWLIB_VERSION", [The newlib version in string format.]) -AC_DEFINE(__NEWLIB__, NEWLIB_MAJOR_VERSION, [The newlib major version number.]) -AC_DEFINE(__NEWLIB_MINOR__, NEWLIB_MINOR_VERSION, [The newlib minor version number.]) -AC_DEFINE(__NEWLIB_PATCHLEVEL__, NEWLIB_PATCHLEVEL_VERSION, [The newlib patch level.]) +dnl These are AC_SUBST instead of AC_DEFINE as they're hand maintained in a +dnl dedicated _newlib_version.h, and we don't want them in newlib.h. +AC_SUBST([NEWLIB_VERSION]) +AC_SUBST([NEWLIB_MAJOR_VERSION]) +AC_SUBST([NEWLIB_MINOR_VERSION]) +AC_SUBST([NEWLIB_PATCHLEVEL_VERSION]) if test "${multilib}" = "yes"; then multilib_arg="--enable-multilib" -- cgit v1.2.3