From a1a7aed05b1f2af9df29050624452945164de987 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 25 Mar 2024 15:04:31 +0100 Subject: [PATCH] fix(rust-cc): reorder zig cc args reorder args to ensure `target` is correctly overriden for compatibility with zig https://github.com/ziglang/zig/issues/4911 Signed-off-by: Roman Volosatovs --- lib/rust/mkAttrs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/rust/mkAttrs.nix b/lib/rust/mkAttrs.nix index c5d04ac..0fb8cdb 100644 --- a/lib/rust/mkAttrs.nix +++ b/lib/rust/mkAttrs.nix @@ -308,7 +308,7 @@ with self.lib.rust.targets; # https://actually.fyi/posts/zig-makes-rust-cross-compilation-just-work # https://github.com/rust-cross/cargo-zigbuild final.writeShellScriptBin "${target}-zigcc" '' - ${final.zig}/bin/zig cc -target ${target'} ${optionalString pkgsCross.stdenv.buildPlatform.isDarwin ''--sysroot="$SDKROOT" -I"$SDKROOT/usr/include" -L"$SDKROOT/usr/lib" -F"$SDKROOT/System/Library/Frameworks"''} $@ + ${final.zig}/bin/zig cc ${optionalString pkgsCross.stdenv.buildPlatform.isDarwin ''--sysroot="$SDKROOT" -I"$SDKROOT/usr/include" -L"$SDKROOT/usr/lib" -F"$SDKROOT/System/Library/Frameworks"''} $@ -target ${target'} ''; targetArgs =