From 4f979d246ae4c9c43373b92e7c81443bf0c0aaba Mon Sep 17 00:00:00 2001 From: Bilal Elmoussaoui Date: Fri, 22 Apr 2022 00:50:51 +0200 Subject: [PATCH] flatpak: Move mold config to the manifest --- .cargo/config.toml | 3 --- build-aux/com.belmoussaoui.Authenticator.Devel.json | 6 ++++++ 2 files changed, 6 insertions(+), 3 deletions(-) delete mode 100644 .cargo/config.toml diff --git a/.cargo/config.toml b/.cargo/config.toml deleted file mode 100644 index cdbaf5f..0000000 --- a/.cargo/config.toml +++ /dev/null @@ -1,3 +0,0 @@ -[target.x86_64-unknown-linux-gnu] -linker = "clang" -rustflags = ["-C", "link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold"] diff --git a/build-aux/com.belmoussaoui.Authenticator.Devel.json b/build-aux/com.belmoussaoui.Authenticator.Devel.json index 0f2ed60..fde1616 100644 --- a/build-aux/com.belmoussaoui.Authenticator.Devel.json +++ b/build-aux/com.belmoussaoui.Authenticator.Devel.json @@ -23,6 +23,12 @@ "append-path": "/usr/lib/sdk/rust-stable/bin", "prepend-path": "/usr/lib/sdk/llvm12/bin", "prepend-ld-library-path": "/usr/lib/sdk/llvm12/lib", + "env": { + "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER": "clang", + "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS": "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold", + "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER": "clang", + "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUSTFLAGS": "-C link-arg=-fuse-ld=/usr/lib/sdk/rust-stable/bin/mold" + }, "build-args": [ "--share=network" ],