Skip to content

Commit 23d774a

Browse files
committed
Update xtask
1 parent 6fa5bf3 commit 23d774a

1 file changed

Lines changed: 1 addition & 5 deletions

File tree

xtask/src/main.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -131,15 +131,13 @@ fn add_magic(path: &PathBuf, magic: &str) -> Result<(), DynError> {
131131
fn build(bin: &str) -> Result<(), DynError> {
132132
create_dist_dir()?;
133133

134-
let arch: &str;
135134
let cargo: &str;
136135
let target: &str;
137136
let mut is_strip = true;
138137
let mut build_args = Vec::new();
139138

140139
if bin.ends_with("aarch64") {
141140
cargo = "cross";
142-
arch = "aarch64";
143141
is_strip = false;
144142
target = TARGET_AARCH64;
145143
build_args.append(&mut vec![
@@ -148,7 +146,6 @@ fn build(bin: &str) -> Result<(), DynError> {
148146
])
149147
} else {
150148
cargo = "cargo";
151-
arch = "x86_64";
152149
target = TARGET_X86_64;
153150
build_args.append(&mut vec![
154151
"+nightly", "build", "--release",
@@ -157,7 +154,6 @@ fn build(bin: &str) -> Result<(), DynError> {
157154
"-Z", "build-std-features=panic_immediate_abort"
158155
])
159156
}
160-
let bin = bin.replace(&format!("-{arch}"), "");
161157

162158
let mut magic = "RI";
163159
if bin.contains("appimage") {
@@ -185,7 +181,7 @@ fn build(bin: &str) -> Result<(), DynError> {
185181
.join("release")
186182
.join(BIN_NAME);
187183

188-
let dst_bin_name = &format!("{BIN_NAME}-{bin}-{arch}");
184+
let dst_bin_name = &format!("{BIN_NAME}-{bin}");
189185
let dst = dist_dir().join(dst_bin_name);
190186

191187
rename(&src, &dst)?;

0 commit comments

Comments
 (0)