Fix cc rs custom target triple

.github/workflows/gh-pages.yaml

@@ -42,7 +42,7 @@ jobs:
           path: stable-v0.5
           ref: 'stable/v0.5'
       - name: Setup Pages
-        uses: actions/configure-pages@v3
+        uses: actions/configure-pages@v5
       - name: Build mdbook for main branch
         working-directory: 'main/doc'
         run: mdbook build
@@ -70,9 +70,9 @@ jobs:
       - name: Debug print
         run: ls -la main/doc/book/v0.5
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v2
+        uses: actions/upload-pages-artifact@v3
         with:
           path: 'main/doc/book'
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v2
+        uses: actions/deploy-pages@v4

.github/workflows/linux.yaml

@@ -43,6 +43,7 @@ jobs:
         with:
           toolchain: ${{inputs.rust}}
           targets: ${{inputs.target_arch}}-unknown-linux-gnu
+          components: rust-src
       - name: Install Cross Compiler
         shell: bash
         run: |

.github/workflows/test.yaml

@@ -61,6 +61,7 @@ jobs:
         compiler:
           - cl
           - clang-cl
+          - clang
         include:
           - os: windows-2022
             vs_version: vs-2022
@@ -79,6 +80,10 @@ jobs:
             arch: i686
           - compiler: clang-cl
             arch: aarch64
+          - compiler: clang
+            arch: i686
+          - compiler: clang
+            arch: aarch64
 
     steps:
       - uses: actions/checkout@v4
@@ -93,6 +98,7 @@ jobs:
         with:
           toolchain: ${{matrix.rust}}
           targets: ${{matrix.arch}}-pc-windows-msvc
+          components: rust-src
       - name: Setup MSVC Development Environment
         uses: ilammy/msvc-dev-cmd@v1
         with:
@@ -137,6 +143,7 @@ jobs:
         with:
           toolchain: ${{matrix.rust}}
           targets: ${{matrix.arch}}-pc-windows-gnu
+          components: rust-src
       - name: Configure
         run: cmake -S. -Bbuild "-DRust_TOOLCHAIN=${{steps.install_rust.outputs.name}}" --preset "${{ matrix.generator }}-${{ matrix.arch }}-pc-windows-gnu-${{ matrix.compiler }}"
       - name: Run Tests
@@ -176,6 +183,7 @@ jobs:
         with:
           toolchain: stable
           targets: ${{matrix.arch}}-pc-windows-gnullvm
+          components: rust-src
       - uses: msys2/setup-msys2@v2
         with:
           msystem: ${{matrix.msystem}}
@@ -211,6 +219,7 @@ jobs:
         with:
           toolchain: stable
           targets: aarch64-unknown-linux-gnu
+          components: rust-src
       - name: Configure
         run: cmake -S. -Bbuild "-DRust_TOOLCHAIN=${{steps.install_rust.outputs.name}}" -DRust_CARGO_TARGET=aarch64-unknown-linux-gnu
       - name: Run Tests
@@ -295,6 +304,7 @@ jobs:
         with:
           toolchain: ${{matrix.rust}}
           targets: ${{matrix.arch}}-apple-darwin
+          components: rust-src
       - name: Configure
         run: cmake -S. -Bbuild --log-level=DEBUG -G "${{ matrix.generator }}" "-DRust_TOOLCHAIN=${{steps.install_rust.outputs.name}}" --preset "${{ matrix.arch }}-apple-darwin-${{ matrix.compiler }}"
       - name: Run Tests
@@ -335,12 +345,13 @@ jobs:
       - name: Install CMake
         uses: lukka/get-cmake@519de0c7b4812477d74976b2523a9417f552d126
         with:
-          cmakeVersion: "~3.22.0"
+          cmakeVersion: "~3.24.0"
           ninjaVersion: "~1.10.0"
       - name: Install Rust
         uses: dtolnay/rust-toolchain@master
         with:
           toolchain: stable minus 2 releases
+          components: rust-src
       - name: Configure
         run: >
           cmake
@@ -353,6 +364,30 @@ jobs:
         working-directory: build
         run: ctest --output-on-failure --build-config Debug -j 3 -R "^cxxbridge"
 
+  autoinstall_cargo_target:
+    name: Test Auto-installing Cargo target via rustup
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install CMake
+        uses: lukka/get-cmake@519de0c7b4812477d74976b2523a9417f552d126
+      - name: Install Rust
+        id: install_rust
+        uses: dtolnay/rust-toolchain@stable
+      - name: Install Cross Compiler
+        shell: bash
+        run: |
+          echo "::group::apt-install"
+          sudo apt-get update
+          sudo apt-get install -y gcc-aarch64-linux-gnu
+          echo "::endgroup::"
+      - name: Assert rustup target is not installed
+        run: rustup show | ( ! grep aarch64)
+      - name: Configure Corrosion
+        run: cmake -S. -Bbuild -GNinja -DRust_RUSTUP_INSTALL_MISSING_TARGET=ON --preset "aarch64-unknown-linux-gnu-gcc"
+      - name: Check rustup target is installed after configuring
+        run: rustup show | grep aarch64
+
   install:
     name: Test Corrosion as a Library
     runs-on: ${{ matrix.os }}
@@ -383,6 +418,7 @@ jobs:
         uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{matrix.rust}}
+          components: rust-src
       - name: Test Corrosion as installed module
         run: >
           cmake
@@ -410,6 +446,7 @@ jobs:
       - linux_stage2
       - darwin
       - test_cxxbridge
+      - autoinstall_cargo_target
       - install
     runs-on: ubuntu-latest
     # Step copied from: https://github.com/cross-rs/cross/blob/80c9f9109a719ffb0f694060ddc6e371d5b3a540/.github/workflows/ci.yml#L361

.github/workflows/visual_studio.yaml

@@ -37,15 +37,16 @@ jobs:
         with:
           toolchain: ${{inputs.rust}}
           targets: ${{inputs.target_arch}}-pc-windows-msvc
+          components: rust-src
       # The initial configure for MSVC is quite slow, so we cache the build directory
       # (including the build directories of the tests) since reconfiguring is
       # significantly faster.
-      - name: Cache MSVC build directory
-        id: cache-msvc-builddir
-        uses: actions/cache@v4
-        with:
-          path: build
-          key: ${{ inputs.os }}-${{ inputs.target_arch }}-${{ inputs.rust }}-msvc-${{ inputs.vs_version}}-build
+      # - name: Cache MSVC build directory
+      #   id: cache-msvc-builddir
+      #   uses: actions/cache@v4
+      #   with:
+      #     path: build
+      #     key: ${{ inputs.os }}-${{ inputs.target_arch }}-${{ inputs.rust }}-msvc-${{ inputs.vs_version}}-build
       - name: Configure
         run: cmake -S. -Bbuild -DCORROSION_TESTS_KEEP_BUILDDIRS=ON "-DRust_TOOLCHAIN=${{steps.install_rust.outputs.name}}" --preset "vs-${{ inputs.vs_version }}-${{ inputs.target_arch }}"
       - name: Run Tests

CMakePresets.json

@@ -200,6 +200,10 @@
             "name": "ninja-x86_64-pc-windows-msvc-clang-cl",
             "inherits": ["ninja", "x86_64-pc-windows-msvc", "clang-cl"]
         },
+        {
+            "name": "ninja-x86_64-pc-windows-msvc-clang",
+            "inherits": ["ninja", "x86_64-pc-windows-msvc", "clang"]
+        },
         {
             "name": "ninja-i686-pc-windows-msvc-cl",
             "inherits": ["ninja", "i686-pc-windows-msvc", "cl", "windows-10-cross"]
@@ -208,6 +212,10 @@
             "name": "ninja-i686-pc-windows-msvc-clang-cl",
             "inherits": ["ninja", "i686-pc-windows-msvc", "clang-cl", "windows-10-cross"]
         },
+        {
+            "name": "ninja-i686-pc-windows-msvc-clang",
+            "inherits": ["ninja", "i686-pc-windows-msvc", "clang", "windows-10-cross"]
+        },
         {
             "name": "ninja-aarch64-pc-windows-msvc-cl",
             "inherits": ["ninja", "aarch64-pc-windows-msvc", "cl", "windows-10-cross"]
@@ -216,6 +224,10 @@
             "name": "ninja-aarch64-pc-windows-msvc-clang-cl",
             "inherits": ["ninja", "aarch64-pc-windows-msvc", "clang-cl", "windows-10-cross"]
         },
+        {
+            "name": "ninja-aarch64-pc-windows-msvc-clang",
+            "inherits": ["ninja", "aarch64-pc-windows-msvc", "clang", "windows-10-cross"]
+        },
         {
             "name": "ninja-x86_64-pc-windows-gnullvm",
             "inherits": ["ninja", "windows-only", "clang"],

RELEASES.md

@@ -6,6 +6,15 @@
   [v0.4.0 Release notes](#040-lts-2023-06-01) for more details.
 - Removed native tooling and the corresponding option `CORROSION_NATIVE_TOOLING`.
   Corrosion now always uses pure CMake.
+- Fix Corrosion placing artifacts into the wrong directory when:
+  1. using a Multi-Config Generator (e.g Visual Studio or XCode) AND
+  2. `OUTPUT_DIRECTORY_<CONFIG>` is not set AND 
+  3. `OUTPUT_DIRECTORY` is set AND
+  4. `OUTPUT_DIRECTORY` does not contain a generator expression
+
+  Corrosion now places artifacts into a `$<CONFIG>` subdirectory of the
+  specified `OUTPUT_DIRECTORY`. This matches the [documented behavior][doc-cmake-rt-output-dir]
+  of CMake for regular CMake targets. ([#568]).
 
 ### New features
 
@@ -14,8 +23,21 @@
   the crate-types of Rust libraries (e.g. force building as a staticlib instead of an rlib).
 - Support *-windows-gnullvm targets. 
 - experimental support in corrosion_install for installing libraries and header files
+- Add `CORROSION_TOOLS_RUST_TOOLCHAIN` cache variable which allows users to select a different
+  rust toolchain for compiling build-tools used by corrosion (currently cbindgen and cxxbridge).
+  This mainly allows using a newer toolchain for such build-tools then for the actual project.
 
+[doc-cmake-rt-output-dir]: https://cmake.org/cmake/help/latest/prop_tgt/RUNTIME_OUTPUT_DIRECTORY.html
 [#459]: https://github.com/corrosion-rs/corrosion/pull/459
+[#568]: https://github.com/corrosion-rs/corrosion/pull/568
+
+# v0.5.1 (2024-12-29)
+
+### Fixes
+
+- Update FindRust to support `rustup` v1.28.0. Support for older rustup versions is retained,
+  so updating corrosion quickly is recommended to all rustup users.
+
 
 # v0.5.0 (2024-05-11)
 
@@ -62,7 +84,7 @@
 
 # v0.4.9 (2024-05-01)
 
-### New Features
+### New Features 
 
 - Automatically detect Rust target for OpenHarmony ([#510]).