Merge pull request #1016 from Alexendoo/remove-linker-handling

rust-lang · Nov 24, 2021 · d186cd2 · d186cd2
2 parents 84328fc + db12522
commit d186cd2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/autofix.yml b/.github/workflows/autofix.yml
@@ -26,8 +26,6 @@ jobs:
         run: |
           rustup set profile minimal
           rustup toolchain install nightly
-          # aarch64-apple-darwin is needed for issue-84020 and issue-84984
-          rustup target add --toolchain nightly aarch64-apple-darwin
 
       - run: cargo run -p autofix
         env:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,8 +13,6 @@ jobs:
         run: |
           rustup set profile minimal
           rustup toolchain install nightly
-          # aarch64-apple-darwin is needed for issue-84020 and issue-84984
-          rustup target add --toolchain nightly aarch64-apple-darwin
 
       - name: cargo run glacier
         run: cargo run

diff --git a/ices/84020.sh → fixed/84020.sh b/ices/84020.sh → fixed/84020.sh
diff --git a/ices/87813.rs → ices/87813.sh b/ices/87813.rs → ices/87813.sh
@@ -1,3 +1,6 @@
+#!/usr/bin/env bash
+
+OUTPUT=$(rustc - 2>&1 << EOF
 #[inline(always)]
 fn other_ext() {
     extern "C" {
@@ -18,3 +21,10 @@ fn main() {
     this_ext();
     other_ext();
 }
+EOF
+)
+
+echo "$OUTPUT"
+if echo "$OUTPUT" | grep -q 'error: linking with .* failed'; then
+    exit 101
+fi
diff --git a/src/lib.rs b/src/lib.rs
@@ -67,9 +67,6 @@ impl ICE {
             ice: self,
             outcome: match output.status.code() {
                 _ if stderr.contains("error: internal compiler error") => Outcome::ICEd,
-                Some(x) if x != 0 && stderr.contains("error: linking with `cc` failed") => {
-                    Outcome::ICEd
-                }
                 Some(0) => Outcome::NoError,
                 Some(101) => Outcome::ICEd, // An ICE will cause an error code of 101
                 // Bash uses 128+N for processes terminated by signal N