diff --git a/_build.sh b/_build.sh index 247b4babf..3c355fd83 100755 --- a/_build.sh +++ b/_build.sh @@ -1198,6 +1198,8 @@ build_single_target() { _LIBS_GLOBAL="${_LIBS_GLOBAL} -lc ${ccrtlib}" fi + ls -lA + if [ "${_CCRT}" = 'clang-rt' ]; then if [ "${_TOOLCHAIN}" != 'llvm-apple' ]; then if [ "${_CRT}" = 'musl' ] && [ "${_DISTRO}" = 'debian' ]; then @@ -1208,7 +1210,7 @@ build_single_target() { ccrtlib="$("clang${_CCSUFFIX}" -print-libgcc-file-name -rtlib=compiler-rt)" # /usr/lib/llvm-13/lib/clang/13.0.1/lib/linux/libclang_rt.builtins-aarch64.a ccrtlib="$(basename "${ccrtlib}" | cut -c 4-)" # delete 'lib' prefix ccrtlib="-l${ccrtlib%.*}" # clang_rt.builtins-aarch64 or gcc - elif [ -d my-pkg/usr/lib/clang ]; then # cross + elif [ -d 'my-pkg/usr/lib/clang' ]; then # cross # If we have the target CPU's clang-rt package installed, use it: ccrtdir="$(find \ "$(pwd)/my-pkg/usr/lib/clang" -mindepth 1 -maxdepth 1 -type d | sort | tail -n 1)" # ../my-pkg/usr/lib/clang/15/lib/linux diff --git a/_ci-linux-debian.sh b/_ci-linux-debian.sh index 36c3ff270..9db75080c 100755 --- a/_ci-linux-debian.sh +++ b/_ci-linux-debian.sh @@ -96,6 +96,7 @@ if [ -n "${dl}" ]; then apt-get --quiet 2 --option Dpkg::Use-Pty=0 download ${dl} # libclang-common-15-dev_1%3a15.0.6-4+b1_amd64.deb dpkg --extract ./*.deb my-pkg + find . fi ./_build.sh