Merge pull request #5762 from rschupp/family-triplet

fix detection of multiarch lib and include directories
This commit is contained in:
CvH 2021-10-20 19:12:37 +02:00 committed by GitHub
commit 45d6560616
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -67,12 +67,14 @@ if [ -z "$HOST_LIBDIR" ]; then
# ubuntu/debian specific "multiarch support"
export MACHINE_HARDWARE_NAME="$(uname -m)"
export MACHINE_HARDWARE_PLATFORM="$(uname -i)"
FAMILY_TRIPLET=${HOST_NAME/${MACHINE_HARDWARE_NAME}/${MACHINE_HARDWARE_PLATFORM}}
if [ -d /lib/$FAMILY_TRIPLET ]; then
HOST_LIBDIR="$HOST_LIBDIR /lib/$FAMILY_TRIPLET"
fi
if [ -d /usr/lib/$FAMILY_TRIPLET ]; then
HOST_LIBDIR="$HOST_LIBDIR /usr/lib/$FAMILY_TRIPLET"
FAMILY_TRIPLET=$($LOCAL_CC -print-multiarch)
if [ -n "$FAMILY_TRIPLET" ]; then
if [ -d /lib/$FAMILY_TRIPLET ]; then
HOST_LIBDIR="$HOST_LIBDIR /lib/$FAMILY_TRIPLET"
fi
if [ -d /usr/lib/$FAMILY_TRIPLET ]; then
HOST_LIBDIR="$HOST_LIBDIR /usr/lib/$FAMILY_TRIPLET"
fi
fi
# default multiarch support