From 3e5ba23fd95ad21cfd6c73c4b1363ffdaecda891 Mon Sep 17 00:00:00 2001 From: Ben Lovy Date: Fri, 10 Jan 2025 10:12:50 -0500 Subject: [PATCH] fix(rust): correct CARGO_TARGET_LINKER compiler name on macOS --- packages/rust/cargo.tg.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/rust/cargo.tg.ts b/packages/rust/cargo.tg.ts index 6239f13c..082471fb 100644 --- a/packages/rust/cargo.tg.ts +++ b/packages/rust/cargo.tg.ts @@ -155,8 +155,12 @@ export const build = tg.target(async (...args: std.Args) => { ); // When not cross-compiling, ensure the `gcc` provided by the SDK is used, which enables Tangram linking. + let compilerName = "gcc"; + if (os === "darwin") { + compilerName = "clang"; + } let toolchainEnv = { - [`CARGO_TARGET_${tripleToEnvVar(target, true)}_LINKER`]: `gcc`, + [`CARGO_TARGET_${tripleToEnvVar(target, true)}_LINKER`]: compilerName, }; // If cross-compiling, set additional environment variables.