Fix s390x-musl sysroot nested directory structure (#213)

* Initial plan

* Fix s390x-musl std library by passing environment variables to build-std.sh

Co-authored-by: messense <1556054+messense@users.noreply.github.com>

* Test s390x after docker image build

* Fix s390x-musl by using correct MUSL_TARGET path

Co-authored-by: messense <1556054+messense@users.noreply.github.com>

* Fix sysroot nested directory structure in build-sysroot tool

Co-authored-by: messense <1556054+messense@users.noreply.github.com>

* Revert Dockerfile and build-std.sh, keep only Build.yml and build-sysroot changes

Co-authored-by: messense <1556054+messense@users.noreply.github.com>

* Refactor Build.yml for s390x and test conditions

Removed MUSL_TARGET for s390x and updated test condition.

* Update deps in tests

* update ci

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: messense <1556054+messense@users.noreply.github.com>
Co-authored-by: messense <messense@icloud.com>

Author: Copilot

.github/workflows/Build.yml

@@ -209,11 +209,18 @@ jobs:
           cache-from: type=registry,ref=ghcr.io/${{ github.repository_owner }}/rust-musl-cross:buildcache-${{ matrix.env.IMAGE_TAG }}-${{ matrix.os.arch }}
           cache-to: type=registry,ref=ghcr.io/${{ github.repository_owner }}/rust-musl-cross:buildcache-${{ matrix.env.IMAGE_TAG }}-${{ matrix.os.arch }},mode=max
       - name: Test Docker cargo build
-        if: ${{ matrix.os.arch == 'amd64' && !startsWith(matrix.env.TARGET, 'armv5te') && !startsWith(matrix.env.TARGET, 's390x') && !startsWith(matrix.env.TARGET, 'riscv64') }}
+        if: ${{ matrix.os.arch != 'armv7' && !startsWith(matrix.env.TARGET, 'armv5te') && !startsWith(matrix.env.TARGET, 's390x') && !startsWith(matrix.env.TARGET, 'riscv64') }}
         run: |
           docker run --rm \
             -v "$(pwd)/tests":/home/rust/src \
             ghcr.io/${{ github.repository_owner }}/rust-musl-cross:$IMAGE_TAG-${{ matrix.os.arch }} bash -c "cargo build"
+      - name: Test Docker cargo build (s390x)
+        if: ${{ matrix.os.arch != 'armv7' && startsWith(matrix.env.TARGET, 's390x') }}
+        run: |
+          docker run --rm \
+            -v "$(pwd)/tests":/home/rust/src \
+            -e CFLAGS="-march=z10 -mzarch" \
+            ghcr.io/${{ github.repository_owner }}/rust-musl-cross:$IMAGE_TAG-${{ matrix.os.arch }} bash -c "cargo build"
       - name: Build and push multiarch image
         if: ${{ github.event_name != 'pull_request' }}
         env:

build-sysroot/src/main.rs

@@ -48,10 +48,7 @@ fn main() -> Result<()> {
         .join("rust")
         .join("library");
 
-    let sysroot_dir = PathBuf::from(&sysroot_base)
-        .join("lib")
-        .join("rustlib")
-        .join(&target);
+    let sysroot_dir = PathBuf::from(&sysroot_base);
 
     println!("Building sysroot for target: {}", target);
     println!("Source directory: {}", src_dir.display());