From eac1db1c0ddbd0ec61601284048e9ade92a26542 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Fri, 10 Jun 2022 23:14:39 +0300 Subject: [PATCH] prepare-cross-toolchain: Simplify code using "clang --print-resource-dir" --- prepare-cross-toolchain.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/prepare-cross-toolchain.sh b/prepare-cross-toolchain.sh index 9cbc942..364b013 100755 --- a/prepare-cross-toolchain.sh +++ b/prepare-cross-toolchain.sh @@ -26,7 +26,8 @@ CROSS_ARCH="$3" : ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64}} -CLANG_VERSION=$(basename $(dirname $(dirname $(dirname $($SRC/bin/clang --print-libgcc-file-name -rtlib=compiler-rt))))) +CLANG_RESOURCE_DIR="$("$SRC/bin/clang" --print-resource-dir)" +CLANG_VERSION=$(basename "$CLANG_RESOURCE_DIR") # If linked to a shared libc++/libunwind, we need to bundle those DLLs # in the bin directory. @@ -36,7 +37,7 @@ for i in libc++ libunwind; do fi done -cp -a $SRC/lib/clang/$CLANG_VERSION/lib $DEST/lib/clang/$CLANG_VERSION +cp -a $CLANG_RESOURCE_DIR/lib $DEST/lib/clang/$CLANG_VERSION rm -rf $DEST/include cp -a $SRC/generic-w64-mingw32/include $DEST/include for arch in $ARCHS; do