linux cross clang-rt support 15

curl · Oct 31, 2023 · 62f86ba · 62f86ba
1 parent ddaefe8
commit 62f86ba
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/_build.sh b/_build.sh
@@ -1212,7 +1212,7 @@ build_single_target() {
           ccrtlib="-l${ccrtlib%.*}"  # clang_rt.builtins-aarch64 or gcc
         elif [ -d 'my-pkg/usr/lib/clang' ]; then  # cross
           # If we have the target CPU's clang-rt package installed, use it:
-          ccrtdir="$(find \
+          ccrtdir="$(find -L \
             "$(pwd)/my-pkg/usr/lib/clang" -mindepth 1 -maxdepth 1 -type d | sort | tail -n 1)"  # ../my-pkg/usr/lib/clang/15/lib/linux
           if [ -z "${ccrtdir}" ]; then
             >&2 echo '! Error: Failed to detect cross-clang-rt env root.'

diff --git a/_ci-linux-debian.sh b/_ci-linux-debian.sh
@@ -104,12 +104,11 @@ if [ -n "${dl}" ]; then
   if [ ! -d 'my-pkg/usr/lib/clang' ]; then
     ln -s -f "llvm${CW_CCSUFFIX}/lib/clang" 'my-pkg/usr/lib/clang'
   fi
-  find .
+  find . | sort
   echo '------------'
-  find 'my-pkg/usr/lib/clang'
+  find -L 'my-pkg/usr/lib/clang' | sort
   echo '------------'
-  find 'my-pkg/usr/lib/clang' -mindepth 1 -maxdepth 1 -type d | sort | tail -n 1
-  false
+  find -L 'my-pkg/usr/lib/clang' -mindepth 1 -maxdepth 1 -type d | sort | tail -n 1
 fi
 
 ./_build.sh