procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libstdc++: Add --disable-libstdcxx-hosted as an alias for hosted-libstdcxx

Browse source 
Most libstdc++ configure args are of the form --enable-libstdcxx-xxx but
the option to build freestanding is --disable-hosted-libstdcxx. If you
accidentally type --disable-libstdcxx-hosted then it will be ignored.

This adds --disable-libstdcxx-hosted as an alias for the existing arg,
so it works whichever way you say it. If both args are used explicitly
and their values do not agree, configure fails with an error.

libstdc++-v3/ChangeLog:

	* acinclude.m4 (GLIBCXX_ENABLE_HOSTED): Add libstdcxx-hosted
	enable arg as an alias for hosted-libstdcxx enable arg.
	* configure: Regenerate.
This commit is contained in:
Jonathan Wakely 2022-10-06 18:41:22 +01:00
parent 93b3ab6c0c
commit 6bd2c1231a
2 changed files with 49 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libstdc++-v3/acinclude.m4
View file

@ -2962,6 +2962,10 @@ dnl installing only the headers required by [17.4.1.3] and the language
dnl support library. More than that will be built (to keep the Makefiles
dnl conveniently clean), but not installed.
dnl
dnl Also define --disable-libstdcxx-hosted as an alias for
dnl --disable-hosted-libstdcxx but fail if both are given
dnl and their values do not agree.
dnl
dnl Sets:
dnl is_hosted (yes/no)
dnl
@ -2971,7 +2975,8 @@ dnl
AC_DEFUN([GLIBCXX_ENABLE_HOSTED], [
AC_ARG_ENABLE([hosted-libstdcxx],
AC_HELP_STRING([--disable-hosted-libstdcxx],
[only build freestanding C++ runtime support]),,
[only build freestanding C++ runtime support]),
[enable_hosted_libstdcxx_was_given=yes],
[case "$host" in
arm*-*-symbianelf*)
enable_hosted_libstdcxx=no
@ -2980,6 +2985,21 @@ AC_DEFUN([GLIBCXX_ENABLE_HOSTED], [
enable_hosted_libstdcxx=yes
;;
esac])
# Because most configure args are --enable-libstdcxx-foo add an alias
# of that form for --enable-hosted-libstdcxx.
AC_ARG_ENABLE([libstdcxx-hosted],
AC_HELP_STRING([--disable-libstdcxx-hosted],
[alias for --disable-hosted-libstdcxx]),
[if test "$enable_hosted_libstdcxx_was_given" = yes; then
if test "$enable_hosted_libstdcxx" != "$enableval"; then
AC_MSG_ERROR([--enable-libstdcxx-hosted=$enableval conflicts with --enable-hosted-libstdcxx=$enable_hosted_libstdcxx])
fi
else
enable_hosted_libstdcxx=${enableval}
fi
],)
freestanding_flags=
if test "$enable_hosted_libstdcxx" = no; then
AC_MSG_NOTICE([Only freestanding libraries will be built])

37
libstdc++-v3/configure vendored
View file

@ -922,6 +922,7 @@ enable_fast_install
with_gnu_ld
enable_libtool_lock
enable_hosted_libstdcxx
enable_libstdcxx_hosted
enable_libstdcxx_verbose
enable_libstdcxx_pch
with_libstdcxx_lock_policy
@ -1610,6 +1611,8 @@ Optional Features:
--disable-libtool-lock avoid locking (might break parallel builds)
--disable-hosted-libstdcxx
only build freestanding C++ runtime support
--disable-libstdcxx-hosted
alias for --disable-hosted-libstdcxx
--disable-libstdcxx-verbose
disable termination messages to standard error
--enable-libstdcxx-pch build pre-compiled libstdc++ headers
@ -12200,7 +12203,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 12203 "configure"
#line 12206 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -12306,7 +12309,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 12309 "configure"
#line 12312 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -15635,7 +15638,7 @@ postdeps_CXX=`echo " $postdeps_CXX " | sed 's, -lstdc++ ,,g'`
# Check whether --enable-hosted-libstdcxx was given.
if test "${enable_hosted_libstdcxx+set}" = set; then :
enableval=$enable_hosted_libstdcxx;
enableval=$enable_hosted_libstdcxx; enable_hosted_libstdcxx_was_given=yes
else
case "$host" in
arm*-*-symbianelf*)
@ -15647,6 +15650,22 @@ else
esac
fi
# Because most configure args are --enable-libstdcxx-foo add an alias
# of that form for --enable-hosted-libstdcxx.
# Check whether --enable-libstdcxx-hosted was given.
if test "${enable_libstdcxx_hosted+set}" = set; then :
enableval=$enable_libstdcxx_hosted; if test "$enable_hosted_libstdcxx_was_given" = yes; then
if test "$enable_hosted_libstdcxx" != "$enableval"; then
as_fn_error $? "--enable-libstdcxx-hosted=$enableval conflicts with --enable-hosted-libstdcxx=$enable_hosted_libstdcxx" "$LINENO" 5
fi
else
enable_hosted_libstdcxx=${enableval}
fi
fi
freestanding_flags=
if test "$enable_hosted_libstdcxx" = no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: Only freestanding libraries will be built" >&5
@ -15990,7 +16009,7 @@ $as_echo "$glibcxx_cv_atomic_long_long" >&6; }
# Fake what AC_TRY_COMPILE does.
cat > conftest.$ac_ext << EOF
#line 15993 "configure"
#line 16012 "configure"
int main()
{
typedef bool atomic_type;
@ -16025,7 +16044,7 @@ $as_echo "$glibcxx_cv_atomic_bool" >&6; }
rm -f conftest*
cat > conftest.$ac_ext << EOF
#line 16028 "configure"
#line 16047 "configure"
int main()
{
typedef short atomic_type;
@ -16060,7 +16079,7 @@ $as_echo "$glibcxx_cv_atomic_short" >&6; }
rm -f conftest*
cat > conftest.$ac_ext << EOF
#line 16063 "configure"
#line 16082 "configure"
int main()
{
// NB: _Atomic_word not necessarily int.
@ -16096,7 +16115,7 @@ $as_echo "$glibcxx_cv_atomic_int" >&6; }
rm -f conftest*
cat > conftest.$ac_ext << EOF
#line 16099 "configure"
#line 16118 "configure"
int main()
{
typedef long long atomic_type;
@ -16252,7 +16271,7 @@ $as_echo "mutex" >&6; }
# unnecessary for this test.
cat > conftest.$ac_ext << EOF
#line 16255 "configure"
#line 16274 "configure"
int main()
{
_Decimal32 d1;
@ -16294,7 +16313,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
# unnecessary for this test.
cat > conftest.$ac_ext << EOF
#line 16297 "configure"
#line 16316 "configure"
template<typename T1, typename T2>
struct same
{ typedef T2 type; };