Fix THUMBv8 targets.

Author: Alexhuszagh

docker/Dockerfile.thumbv8m.base-none-eabi

@@ -18,14 +18,17 @@ RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
 COPY qemu.sh /
 RUN /qemu.sh arm
 
+COPY toolchain.cmake /opt/toolchain.cmake
+
 ENV CROSS_TOOLCHAIN_PREFIX=arm-none-eabi-
 ENV CROSS_SYSROOT="/usr/lib/arm-none-eabi"
 ENV CROSS_TARGET_RUNNER=qemu-arm
 ENV QEMU_CPU=cortex-m23 \
     AR_thumbv8m.base_none_eabi="$CROSS_TOOLCHAIN_PREFIX"ar \
     CC_thumbv8m.base_none_eabi="$CROSS_TOOLCHAIN_PREFIX"gcc \
     CXX_thumbv8m.base_none_eabi="$CROSS_TOOLCHAIN_PREFIX"g++ \
-    CMAKE_TOOLCHAIN_FILE_thumbv8m.base_none_eabi=/opt/toolchain.cmake \
+    # cmake-rs does not accept CMAKE_TOOLCHAIN_FILE_thumbv8m.base_none_eabi
+    TARGET_CMAKE_TOOLCHAIN_FILE=/opt/toolchain.cmake \
     CARGO_TARGET_THUMBV8M.BASE_NONE_EABI_RUNNER="$CROSS_TARGET_RUNNER" \
     CROSS_CMAKE_SYSTEM_NAME=Generic \
     CROSS_CMAKE_SYSTEM_PROCESSOR="armv8-m.base" \

docker/Dockerfile.thumbv8m.main-none-eabi

@@ -18,14 +18,17 @@ RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
 COPY qemu.sh /
 RUN /qemu.sh arm
 
+COPY toolchain.cmake /opt/toolchain.cmake
+
 ENV CROSS_TOOLCHAIN_PREFIX=arm-none-eabi-
 ENV CROSS_SYSROOT="/usr/lib/arm-none-eabi"
 ENV CROSS_TARGET_RUNNER=qemu-arm
 ENV QEMU_CPU=cortex-m33 \
     AR_thumbv8m.main_none_eabi="$CROSS_TOOLCHAIN_PREFIX"ar \
     CC_thumbv8m.main_none_eabi="$CROSS_TOOLCHAIN_PREFIX"gcc \
     CXX_thumbv8m.main_none_eabi="$CROSS_TOOLCHAIN_PREFIX"g++ \
-    CMAKE_TOOLCHAIN_FILE_thumbv8m.main_none_eabi=/opt/toolchain.cmake \
+    # cmake-rs does not accept CMAKE_TOOLCHAIN_FILE_thumbv8m.main_none_eabi
+    TARGET_CMAKE_TOOLCHAIN_FILE=/opt/toolchain.cmake \
     CARGO_TARGET_THUMBV8M.BASE_NONE_EABI_RUNNER="$CROSS_TARGET_RUNNER" \
     CROSS_CMAKE_SYSTEM_NAME=Generic \
     CROSS_CMAKE_SYSTEM_PROCESSOR="armv8-m.main" \

docker/Dockerfile.thumbv8m.main-none-eabihf

@@ -18,14 +18,17 @@ RUN apt-get update && apt-get install --assume-yes --no-install-recommends \
 COPY qemu.sh /
 RUN /qemu.sh arm
 
+COPY toolchain.cmake /opt/toolchain.cmake
+
 ENV CROSS_TOOLCHAIN_PREFIX=arm-none-eabi-
 ENV CROSS_SYSROOT="/usr/lib/arm-none-eabi"
 ENV CROSS_TARGET_RUNNER=qemu-arm
 ENV QEMU_CPU=cortex-m33 \
     AR_thumbv8m.main_none_eabihf="$CROSS_TOOLCHAIN_PREFIX"ar \
     CC_thumbv8m.main_none_eabihf="$CROSS_TOOLCHAIN_PREFIX"gcc \
     CXX_thumbv8m.main_none_eabihf="$CROSS_TOOLCHAIN_PREFIX"g++ \
-    CMAKE_TOOLCHAIN_FILE_thumbv8m.main_none_eabihf=/opt/toolchain.cmake \
+    # cmake-rs does not accept CMAKE_TOOLCHAIN_FILE_thumbv8m.main_none_eabihf
+    TARGET_CMAKE_TOOLCHAIN_FILE=/opt/toolchain.cmake \
     CARGO_TARGET_THUMBV8M.BASE_NONE_EABI_RUNNER="$CROSS_TARGET_RUNNER" \
     CROSS_CMAKE_SYSTEM_NAME=Generic \
     CROSS_CMAKE_SYSTEM_PROCESSOR="armv8-m.main" \

targets.toml

@@ -464,14 +464,20 @@ std = false
 [[target]]
 target = "thumbv8m.base-none-eabi"
 os = "ubuntu-latest"
+cpp = true
+std = false
 
 [[target]]
 target = "thumbv8m.main-none-eabi"
 os = "ubuntu-latest"
+cpp = true
+std = false
 
 [[target]]
 target = "thumbv8m.main-none-eabihf"
 os = "ubuntu-latest"
+cpp = true
+std = false
 
 [[target]]
 target = "cross"