Skip to content
This repository was archived by the owner on May 23, 2024. It is now read-only.

Commit d186cd2

Browse files
authored
Merge pull request #1016 from Alexendoo/remove-linker-handling
2 parents 84328fc + db12522 commit d186cd2

File tree

5 files changed

+10
-7
lines changed

5 files changed

+10
-7
lines changed

.github/workflows/autofix.yml

-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ jobs:
2626
run: |
2727
rustup set profile minimal
2828
rustup toolchain install nightly
29-
# aarch64-apple-darwin is needed for issue-84020 and issue-84984
30-
rustup target add --toolchain nightly aarch64-apple-darwin
3129
3230
- run: cargo run -p autofix
3331
env:

.github/workflows/main.yml

-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ jobs:
1313
run: |
1414
rustup set profile minimal
1515
rustup toolchain install nightly
16-
# aarch64-apple-darwin is needed for issue-84020 and issue-84984
17-
rustup target add --toolchain nightly aarch64-apple-darwin
1816
1917
- name: cargo run glacier
2018
run: cargo run
File renamed without changes.

ices/87813.rs renamed to ices/87813.sh

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#!/usr/bin/env bash
2+
3+
OUTPUT=$(rustc - 2>&1 << EOF
14
#[inline(always)]
25
fn other_ext() {
36
extern "C" {
@@ -18,3 +21,10 @@ fn main() {
1821
this_ext();
1922
other_ext();
2023
}
24+
EOF
25+
)
26+
27+
echo "$OUTPUT"
28+
if echo "$OUTPUT" | grep -q 'error: linking with .* failed'; then
29+
exit 101
30+
fi

src/lib.rs

-3
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,6 @@ impl ICE {
6767
ice: self,
6868
outcome: match output.status.code() {
6969
_ if stderr.contains("error: internal compiler error") => Outcome::ICEd,
70-
Some(x) if x != 0 && stderr.contains("error: linking with `cc` failed") => {
71-
Outcome::ICEd
72-
}
7370
Some(0) => Outcome::NoError,
7471
Some(101) => Outcome::ICEd, // An ICE will cause an error code of 101
7572
// Bash uses 128+N for processes terminated by signal N

0 commit comments

Comments
 (0)