@@ -224,6 +224,15 @@ if 'CFLAGS' is specified it must enable optimization. For example:
By default for x86_64, the GNU C Library is built with the vector
math library. Use this option to disable the vector math library.
+'--disable-static-c++-tests'
+ By default, if the C++ toolchain doesn't not support static
+ linking, configure couldn't find the C++ header files and the glibc
+ build fails. '--disable-static-c++-link-check' allows the glibc
+ build to finish, but static C++ tests will fail if the C++
+ toolchain doesn't have necessary static C++ libraries. Use this
+ option to skip the static C++ tests. This option implies
+ '--disable-static-c++-link-check'.
+
'--disable-static-c++-link-check'
By default, if the C++ toolchain doesn't not support static
linking, configure couldn't find the C++ header files and the glibc
@@ -778,6 +778,7 @@ ac_user_opts='
enable_option_checking
with_pkgversion
with_bugurl
+enable_static_c___tests
enable_static_c___link_check
with_gd
with_gd_include
@@ -1448,6 +1449,8 @@ Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --disable-static-c++-tests
+ disable static C++ tests[default=no]
--disable-static-c++-link-check
disable static C++ link check [default=no]
--disable-sanity-checks really do not use threads (should not be used except
@@ -3813,6 +3816,20 @@ if test -z "$CPP"; then
fi
+# This will get text that should go into config.make.
+config_vars=
+
+# Check whether --enable-static-c++-tests was given.
+if test ${enable_static_c___tests+y}
+then :
+ enableval=$enable_static_c___tests; static_cxx_tests=$enableval
+else $as_nop
+ static_cxx_tests=yes
+fi
+
+config_vars="$config_vars
+static-cxx-tests = $static_cxx_tests"
+
# Check whether --enable-static-c++-link-check was given.
if test ${enable_static_c___link_check+y}
then :
@@ -4232,7 +4249,7 @@ else $as_nop
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
-if test $static_cxx_link_check = yes; then
+if test $static_cxx_link_check$static_cxx_tests = yesyes; then
# Static case.
old_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -static"
@@ -4277,9 +4294,6 @@ if test "`cd $srcdir; pwd -P`" = "`pwd -P`"; then
as_fn_error $? "you must configure in a separate build directory" "$LINENO" 5
fi
-# This will get text that should go into config.make.
-config_vars=
-
# Check for a --with-gd argument and set libgd-LDFLAGS in config.make.
# Check whether --with-gd was given.
@@ -52,6 +52,16 @@ fi
AC_SUBST(cross_compiling)
AC_PROG_CPP
+# This will get text that should go into config.make.
+config_vars=
+
+AC_ARG_ENABLE([static-c++-tests],
+ AS_HELP_STRING([--disable-static-c++-tests],
+ [disable static C++ tests@<:@default=no@:>@]),
+ [static_cxx_tests=$enableval],
+ [static_cxx_tests=yes])
+LIBC_CONFIG_VAR([static-cxx-tests], [$static_cxx_tests])
+
AC_ARG_ENABLE([static-c++-link-check],
AS_HELP_STRING([--disable-static-c++-link-check],
[disable static C++ link check @<:@default=no@:>@]),
@@ -67,7 +77,7 @@ AC_LANG_PUSH([C++])
AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
[libc_cv_cxx_link_ok=yes],
[libc_cv_cxx_link_ok=no])
-if test $static_cxx_link_check = yes; then
+if test $static_cxx_link_check$static_cxx_tests = yesyes; then
# Static case.
old_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -static"
@@ -92,9 +102,6 @@ if test "`cd $srcdir; pwd -P`" = "`pwd -P`"; then
AC_MSG_ERROR([you must configure in a separate build directory])
fi
-# This will get text that should go into config.make.
-config_vars=
-
# Check for a --with-gd argument and set libgd-LDFLAGS in config.make.
AC_ARG_WITH([gd],
AS_HELP_STRING([--with-gd=DIR],
@@ -252,6 +252,14 @@ configure with @option{--disable-werror}.
By default for x86_64, @theglibc{} is built with the vector math library.
Use this option to disable the vector math library.
+@item --disable-static-c++-tests
+By default, if the C++ toolchain doesn't not support static linking,
+configure couldn't find the C++ header files and the glibc build fails.
+@option{--disable-static-c++-link-check} allows the glibc build to finish,
+but static C++ tests will fail if the C++ toolchain doesn't have necessary
+static C++ libraries. Use this option to skip the static C++ tests. This
+option implies @option{--disable-static-c++-link-check}.
+
@item --disable-static-c++-link-check
By default, if the C++ toolchain doesn't not support static linking,
configure couldn't find the C++ header files and the glibc build fails.
@@ -545,6 +545,9 @@ tests-static += \
# tests-static
tests += tst-cancel24-static
+ifeq ($(static-cxx-tests),no)
+tests-unsupported += tst-cancel24-static
+endif
tests-internal += \
tst-sem11-static \
By default, if the C++ toolchain doesn't not support static linking, configure couldn't find the C++ header files and the glibc build fails. The --disable-static-c++-link-check option allows the glibc build to finish, but static C++ tests will fail if the C++ toolchain doesn't have necessary static C++ libraries which may not be easily installed. Add --disable-static-c++-tests option to skip the static C++ link check and tests. This fixes BZ #31797. Signed-off-by: H.J. Lu <hjl.tools@gmail.com> --- INSTALL | 9 +++++++++ configure | 22 ++++++++++++++++++---- configure.ac | 15 +++++++++++---- manual/install.texi | 8 ++++++++ nptl/Makefile | 3 +++ 5 files changed, 49 insertions(+), 8 deletions(-)