From 9ae23e13c53bc2effd98f9a6ebea29517b2ed3fc Mon Sep 17 00:00:00 2001
From: Dan Gohman <dev@sunfishcode.online>
Date: Sat, 26 Aug 2023 11:46:24 -0700
Subject: [PATCH] Remove more mustang-specific bits.

---
 .github/workflows/main.yml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d6441c1..339ebcc 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -27,11 +27,9 @@ jobs:
           - build: ubuntu
             os: ubuntu-latest
             host_target: x86_64-unknown-linux-gnu
-            mustang_target: x86_64-mustang-linux-gnu
           - build: ubuntu-20.04
             os: ubuntu-20.04
             host_target: x86_64-unknown-linux-gnu
-            mustang_target: x86_64-mustang-linux-gnu
           - build: i686-linux
             os: ubuntu-latest
             target: i686-unknown-linux-gnu
@@ -39,7 +37,6 @@ jobs:
             gcc: i686-linux-gnu-gcc
             libc_package: libc-dev-i386-cross
             host_target: i686-unknown-linux-gnu
-            mustang_target: i686-mustang-linux-gnu
           - build: aarch64-linux
             os: ubuntu-latest
             target: aarch64-unknown-linux-gnu
@@ -48,7 +45,6 @@ jobs:
             qemu: qemu-aarch64 -L /usr/aarch64-linux-gnu
             qemu_target: aarch64-linux-user
             host_target: aarch64-unknown-linux-gnu
-            mustang_target: aarch64-mustang-linux-gnu
           - build: riscv64-linux
             os: ubuntu-latest
             target: riscv64gc-unknown-linux-gnu
@@ -57,7 +53,6 @@ jobs:
             qemu: qemu-riscv64 -L /usr/riscv64-linux-gnu
             qemu_target: riscv64-linux-user
             host_target: riscv64gc-unknown-linux-gnu
-            mustang_target: riscv64gc-mustang-linux-gnu
     steps:
     - uses: actions/checkout@v3
     - name: Configure Cargo target
@@ -79,11 +74,6 @@ jobs:
         sudo apt-get install -y ${{ matrix.gcc_package }} ninja-build
         upcase=$(echo ${{ matrix.host_target }} | awk '{ print toupper($0) }' | sed 's/-/_/g')
         echo CARGO_TARGET_${upcase}_LINKER=${{ matrix.gcc }} >> $GITHUB_ENV
-        upcase=$(echo ${{ matrix.mustang_target }} | awk '{ print toupper($0) }' | sed 's/-/_/g')
-        echo CARGO_TARGET_${upcase}_LINKER=${{ matrix.gcc }} >> $GITHUB_ENV
-        # Configure the `*-mustang` C compiler for the `cc` crate per
-        # <https://github.com/sunfishcode/mustang/blob/main/README.md#the-c-runtime>
-        echo CC_${{ matrix.mustang_target }}=${{ matrix.gcc }} >> $GITHUB_ENV
         echo CC_${{ matrix.target }}=${{ matrix.gcc }} >> $GITHUB_ENV
       if: matrix.gcc_package != '' && matrix.os == 'ubuntu-latest'
 
@@ -102,8 +92,6 @@ jobs:
         # cross executables
         upcase=$(echo ${{ matrix.host_target }} | awk '{ print toupper($0) }' | sed 's/-/_/g')
         echo CARGO_TARGET_${upcase}_RUNNER=${{ runner.tool_cache }}/qemu/bin/${{ matrix.qemu }} >> $GITHUB_ENV
-        upcase=$(echo ${{ matrix.mustang_target }} | awk '{ print toupper($0) }' | sed 's/-/_/g')
-        echo CARGO_TARGET_${upcase}_RUNNER=${{ runner.tool_cache }}/qemu/bin/${{ matrix.qemu }} >> $GITHUB_ENV
 
         # See if qemu is already in the cache
         if [ -f ${{ runner.tool_cache }}/qemu/bin/${{ matrix.qemu }} ]; then