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

Remove linker handling #1016

Merged
merged 2 commits into from
Nov 24, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/autofix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
File renamed without changes.
10 changes: 10 additions & 0 deletions ices/87813.rs → ices/87813.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#!/usr/bin/env bash

OUTPUT=$(rustc - 2>&1 << EOF
#[inline(always)]
fn other_ext() {
extern "C" {
Expand All @@ -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
3 changes: 0 additions & 3 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down