diff options
author | H.J. Lu <hjl.tools@gmail.com> | 2024-06-20 15:28:13 -0700 |
---|---|---|
committer | H.J. Lu <hjl.tools@gmail.com> | 2024-07-02 00:51:34 -0700 |
commit | ba144c179eb12a6aff145582671cbb8b1045c5b9 (patch) | |
tree | 1b7a38ea0ab4bd50303d2f71bc2f5ab6bfe190e2 /configure | |
parent | 23f12e6e0c95aaf8b5b4973d029db794a43f248a (diff) | |
download | glibc-ba144c179eb12a6aff145582671cbb8b1045c5b9.tar.gz glibc-ba144c179eb12a6aff145582671cbb8b1045c5b9.tar.xz glibc-ba144c179eb12a6aff145582671cbb8b1045c5b9.zip |
Add --disable-static-c++-tests option [BZ #31797]
By default, if the C++ toolchain lacks support for static linking, configure fails to 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 the 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>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/configure b/configure index e236b503fe..1bae55b45b 100755 --- a/configure +++ b/configure @@ -771,6 +771,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 @@ -1441,6 +1442,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 @@ -3858,6 +3861,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 : @@ -4291,7 +4308,7 @@ esac 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" @@ -4338,9 +4355,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. |