mirror/gcc
1
0
Fork 0
mirror of https://github.com/gcc-mirror/gcc.git synced 2024-11-21 13:40:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rust: avoid clobbering LIBS

Browse Source 
Save LIBS around calls to AC_SEARCH_LIBS to avoid clobbering $LIBS.

ChangeLog:

	* configure: Regenerate.
	* configure.ac: Save LIBS around calls to AC_SEARCH_LIBS.

Signed-off-by: Marc Poulhiès <dkm@kataplop.net>
Reviewed-by: Thomas Schwinge <tschwinge@baylibre.com>
Tested-by: Thomas Schwinge <tschwinge@baylibre.com>
This commit is contained in:
Marc Poulhiès 2024-08-05 17:41:17 +02:00
parent 7164d98266
commit da3a2985ff
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure vendored
View File

@ -8878,9 +8878,12 @@ fi
# Rust requires -ldl and -lpthread if you are using an old glibc that does not include them by
# default, so we check for them here
# We are doing the test here and not in the gcc/configure to be able to nicely disable the
# build of the Rust frontend in case a dep is missing.
missing_rust_dynlibs=none
save_LIBS="$LIBS"
LIBS=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
$as_echo_n "checking for library containing dlopen... " >&6; }
if ${ac_cv_search_dlopen+:} false; then :
@ -8993,16 +8996,14 @@ if test "$ac_res" != no; then :
fi
CRAB1_LIBS="$LIBS"
LIBS="$save_LIBS"
if test "$ac_cv_search_dlopen" = -ldl; then
CRAB1_LIBS="$CRAB1_LIBS -ldl"
elif test "$ac_cv_search_dlopen" = no; then
if test "$ac_cv_search_dlopen" = no; then
missing_rust_dynlibs="libdl"
fi
if test "$ac_cv_search_pthread_create" = -lpthread; then
CRAB1_LIBS="$CRAB1_LIBS -lpthread"
elif test "$ac_cv_search_pthread_create" = no; then
if test "$ac_cv_search_pthread_create" = no; then
missing_rust_dynlibs="$missing_rust_dynlibs, libpthread"
fi

15
configure.ac
View File

@ -2039,21 +2039,22 @@ AC_SUBST(PICFLAG)
# Rust requires -ldl and -lpthread if you are using an old glibc that does not include them by
# default, so we check for them here
# We are doing the test here and not in the gcc/configure to be able to nicely disable the
# build of the Rust frontend in case a dep is missing.
missing_rust_dynlibs=none
save_LIBS="$LIBS"
LIBS=
AC_SEARCH_LIBS([dlopen], [dl])
AC_SEARCH_LIBS([pthread_create], [pthread])
CRAB1_LIBS="$LIBS"
LIBS="$save_LIBS"
if test "$ac_cv_search_dlopen" = -ldl; then
CRAB1_LIBS="$CRAB1_LIBS -ldl"
elif test "$ac_cv_search_dlopen" = no; then
if test "$ac_cv_search_dlopen" = no; then
missing_rust_dynlibs="libdl"
fi
if test "$ac_cv_search_pthread_create" = -lpthread; then
CRAB1_LIBS="$CRAB1_LIBS -lpthread"
elif test "$ac_cv_search_pthread_create" = no; then
if test "$ac_cv_search_pthread_create" = no; then
missing_rust_dynlibs="$missing_rust_dynlibs, libpthread"
fi