[libcxx-commits] [libcxx] [libcxx][ci] In picolib build, ask clang for the normalised triple (PR #90722)

David Spickett via libcxx-commits libcxx-commits at lists.llvm.org
Wed May 1 07:00:35 PDT 2024


================
@@ -217,7 +217,19 @@ function test-armv7m-picolibc() {
         "${@}"
 
     ${NINJA} -vC "${BUILD_DIR}/compiler-rt" install
-    mv "${BUILD_DIR}/install/lib/armv7m-none-unknown-eabi"/* "${BUILD_DIR}/install/lib"
+
+    # Prior to clang 19, armv7m-none-eabi normalised to armv7m-none-unknown-eabi.
+    # clang 19 changed this to armv7m-unknown-none-eabi. So for as long as 18.x
+    # is supported, we have to ask clang what the triple will be.
+    if [ ! -z "${CC}" ]
+    then
+        C_COMPILER=${CC};
+    else
+        C_COMPILER=cc;
+    fi
----------------
DavidSpickett wrote:

Because I am bad at bash :) Thanks for the tips I'll add those.

https://github.com/llvm/llvm-project/pull/90722


More information about the libcxx-commits mailing list