diff options
| author | Laurențiu Nicola <lnicola@dend.ro> | 2020-04-26 14:53:33 +0300 |
|---|---|---|
| committer | Laurențiu Nicola <lnicola@dend.ro> | 2020-04-28 20:47:13 +0300 |
| commit | 77de40192e6c5f39c511f846850fb60881e8ee9e (patch) | |
| tree | 2ec84d5182ea74a338e3843e32cfd6d27eaed81a | |
| parent | 5671bacfa66a9d83daa1cc42f72ec8701412ccdc (diff) | |
| download | rust-77de40192e6c5f39c511f846850fb60881e8ee9e.tar.gz rust-77de40192e6c5f39c511f846850fb60881e8ee9e.zip | |
Use x86_64-unknown-linux-gnu for releases
| -rw-r--r-- | .github/workflows/release.yaml | 1 | ||||
| -rw-r--r-- | xtask/src/dist.rs | 8 |
2 files changed, 3 insertions, 6 deletions
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 2c1192f0728..3f52f31f805 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -39,7 +39,6 @@ jobs: with: toolchain: stable profile: minimal - target: x86_64-unknown-linux-musl override: true - name: Install Nodejs diff --git a/xtask/src/dist.rs b/xtask/src/dist.rs index a56eeef8d29..aef68089e1e 100644 --- a/xtask/src/dist.rs +++ b/xtask/src/dist.rs @@ -50,21 +50,19 @@ fn dist_server(nightly: bool) -> Result<()> { if cfg!(target_os = "linux") { std::env::set_var("CC", "clang"); run!( - "cargo build --manifest-path ./crates/rust-analyzer/Cargo.toml --bin rust-analyzer --release - --target x86_64-unknown-linux-musl - " + "cargo build --manifest-path ./crates/rust-analyzer/Cargo.toml --bin rust-analyzer --release" // We'd want to add, but that requires setting the right linker somehow // --features=jemalloc )?; if !nightly { - run!("strip ./target/x86_64-unknown-linux-musl/release/rust-analyzer")?; + run!("strip ./target/release/rust-analyzer")?; } } else { run!("cargo build --manifest-path ./crates/rust-analyzer/Cargo.toml --bin rust-analyzer --release")?; } let (src, dst) = if cfg!(target_os = "linux") { - ("./target/x86_64-unknown-linux-musl/release/rust-analyzer", "./dist/rust-analyzer-linux") + ("./target/release/rust-analyzer", "./dist/rust-analyzer-linux") } else if cfg!(target_os = "windows") { ("./target/release/rust-analyzer.exe", "./dist/rust-analyzer-windows.exe") } else if cfg!(target_os = "macos") { |