Skip to content

Commit fdaa5e7

Browse files
authored
Merge pull request #4157 from lnicola/glibc-releases
Use x86_64-unknown-linux-gnu for releases
2 parents c3c7edb + 77de401 commit fdaa5e7

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

Diff for: .github/workflows/release.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ jobs:
3939
with:
4040
toolchain: stable
4141
profile: minimal
42-
target: x86_64-unknown-linux-musl
4342
override: true
4443

4544
- name: Install Nodejs

Diff for: xtask/src/dist.rs

+3-5
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,19 @@ fn dist_server(nightly: bool) -> Result<()> {
5050
if cfg!(target_os = "linux") {
5151
std::env::set_var("CC", "clang");
5252
run!(
53-
"cargo build --manifest-path ./crates/rust-analyzer/Cargo.toml --bin rust-analyzer --release
54-
--target x86_64-unknown-linux-musl
55-
"
53+
"cargo build --manifest-path ./crates/rust-analyzer/Cargo.toml --bin rust-analyzer --release"
5654
// We'd want to add, but that requires setting the right linker somehow
5755
// --features=jemalloc
5856
)?;
5957
if !nightly {
60-
run!("strip ./target/x86_64-unknown-linux-musl/release/rust-analyzer")?;
58+
run!("strip ./target/release/rust-analyzer")?;
6159
}
6260
} else {
6361
run!("cargo build --manifest-path ./crates/rust-analyzer/Cargo.toml --bin rust-analyzer --release")?;
6462
}
6563

6664
let (src, dst) = if cfg!(target_os = "linux") {
67-
("./target/x86_64-unknown-linux-musl/release/rust-analyzer", "./dist/rust-analyzer-linux")
65+
("./target/release/rust-analyzer", "./dist/rust-analyzer-linux")
6866
} else if cfg!(target_os = "windows") {
6967
("./target/release/rust-analyzer.exe", "./dist/rust-analyzer-windows.exe")
7068
} else if cfg!(target_os = "macos") {

0 commit comments

Comments
 (0)