diff --git a/config/optimize b/config/optimize index d81eefea87..ca39331a61 100644 --- a/config/optimize +++ b/config/optimize @@ -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