Testing.

sunfishcode · Sep 9, 2021 · bf9ecad · bf9ecad
1 parent d9eba67
commit bf9ecad
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -83,7 +83,6 @@ jobs:
         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
-        echo CC_${{ matrix.mustang_target }}=${{ matrix.gcc }} >> $GITHUB_ENV
       if: matrix.gcc_package != '' && matrix.os == 'ubuntu-latest'
 
     - name: Install cross-compilation libraries

diff --git a/initialize-c-runtime/build.rs b/initialize-c-runtime/build.rs
@@ -1,4 +1,12 @@
 fn main() {
+    // If we're targeting mustang, tell the `cc` crate how to compile C.
+    let target = std::env::var("TARGET").unwrap();
+    if let Some(stripped) = target.strip_suffix("-mustang") {
+        let arch = std::env::var("CARGO_CFG_TARGET_ARCH").unwrap();
+        let os = std::env::var("CARGO_CFG_TARGET_OS").unwrap();
+        std::env::set_var(format!("CC_{}-gnu", stripped), format!("{}-{}-gnu-gcc", arch, os));
+    }
+
     cc::Build::new()
         .flag("-ffreestanding")
         .file("c/initialize-c-runtime.c")