36 lines
1.6 KiB
Diff
36 lines
1.6 KiB
Diff
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
|
|
index c6144b1968..b9e2471a19 100644
|
|
--- a/common/autoconf/generated-configure.sh
|
|
+++ b/common/autoconf/generated-configure.sh
|
|
@@ -4493,7 +4493,7 @@ VS_TOOLSET_SUPPORTED_2022=true
|
|
#CUSTOM_AUTOCONF_INCLUDE
|
|
|
|
# Do not change or remove the following line, it is needed for consistency checks:
|
|
-DATE_WHEN_GENERATED=1736991241
|
|
+DATE_WHEN_GENERATED=1737030662
|
|
|
|
###############################################################################
|
|
#
|
|
@@ -50593,6 +50593,8 @@ $as_echo_n "checking for libffi lib file location... " >&6; }
|
|
# Fallback on the default /usr/lib dir
|
|
if test -e ${SYSROOT}/usr/lib/libffi.so.? ; then
|
|
LIBFFI_LIB_FILE="${SYSROOT}/usr/lib/libffi.so.?"
|
|
+ elif test -e ${SYSROOT}/usr/lib64/libffi.so.? ; then
|
|
+ LIBFFI_LIB_FILE="${SYSROOT}/usr/lib64/libffi.so.?"
|
|
else
|
|
as_fn_error $? "Could not locate libffi.so.? for bundling" "$LINENO" 5
|
|
fi
|
|
diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4
|
|
index 4ed8b4fdd6..1e759a7589 100644
|
|
--- a/common/autoconf/libraries.m4
|
|
+++ b/common/autoconf/libraries.m4
|
|
@@ -1124,6 +1124,8 @@ AC_DEFUN_ONCE([LIB_SETUP_STATIC_LINK_LIBSTDCPP],
|
|
# Fallback on the default /usr/lib dir
|
|
if test -e ${SYSROOT}/usr/lib/libffi.so.? ; then
|
|
LIBFFI_LIB_FILE="${SYSROOT}/usr/lib/libffi.so.?"
|
|
+ elif test -e ${SYSROOT}/usr/lib64/libffi.so.? ; then
|
|
+ LIBFFI_LIB_FILE="${SYSROOT}/usr/lib64/libffi.so.?"
|
|
else
|
|
AC_MSG_ERROR([Could not locate libffi.so.? for bundling])
|
|
fi
|