use cross environment for x86_64-unknown-linux-musl builds

Author: lmkra

Diff for: .github/workflows/build-and-test.yml

@@ -61,7 +61,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install cross (non-x86_64 linux)
-        if: "!contains(matrix.target, 'x86_64') && runner.os == 'Linux'"
+        if: "matrix.target != 'x86_64-unknown-linux-gnu' && runner.os == 'Linux'"
         run: |
           pushd "$(mktemp -d)"
           wget https://github.com/cross-rs/cross/releases/download/v0.2.4/cross-x86_64-unknown-linux-musl.tar.gz
@@ -75,7 +75,6 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install musl-tools
-          sudo ln -s "/usr/bin/g++" "/usr/bin/musl-g++"
 
       - name: Set up extra cargo flags
         if: matrix.no-zstd-thin