git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v3] rust: respect CARGO_BUILD_TARGET when locating build output

From
James Le Cuirot <chewi@gentoo.org>
Date
Sep 10, 2026, 10:20 UTC
Message-ID
<20260910102013.1235066-2-chewi@gentoo.org>
In-Reply-To
<xmqq4ifyqjdi.fsf@gitster.g>

When cross-compiling, Cargo always writes to a target-tuple subdirectory determined by CARGO_BUILD_TARGET, even when it matches the native tuple. The build looked in $BUILD_DIR/$BUILD_TYPE directly, so it failed to locate the freshly built library.

Respect CARGO_BUILD_TARGET in the output path so the correct artifact is located.

Signed-off-by: James Le Cuirot <chewi@gentoo.org>
---
> This seems to be based on a bit stale codebase.  Specifically you
> would want to build on top of post-924dfced6b (Makefile: support
> universal macOS builds via RUST_TARGETS, 2026-07-08) version of
> Makefile.
Apologies, I had used the maint branch. Now rebased on master.
Show 6 quoted lines
> When CARGO_BUILD_TARGET is not defined, this leaves double slashes
> in the resulting pathname, which may not be incorrect per-se, but
> still is not what you meant to say, which is probably a lot closer
> to
>
>     ${CARGO_BUILD_TARGET+$CARGO_BUILD_TARGET/}

I believed this would not cause an issue, so I intentionally went with simplicity over correctness. It's not a big difference though, so this revision goes with correctness.

 Makefile           | 2 +-
 src/cargo-meson.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index d4b7759..f0ca2e4 100644
--- a/Makefile
+++ b/Makefile
@@ -959,7 +959,7 @@ RUST_LIB_NAME = gitcore.lib
 else
 RUST_LIB_NAME = libgitcore.a
 endif
-RUST_LIB = target/$(RUST_BUILD_CONFIG)/$(RUST_LIB_NAME)
+RUST_LIB = target/$(if $(CARGO_BUILD_TARGET),$(CARGO_BUILD_TARGET)/)$(RUST_BUILD_CONFIG)/$(RUST_LIB_NAME)
 endif

 GITLIBS = common-main.o $(LIB_FILE)
diff --git a/src/cargo-meson.sh b/src/cargo-meson.sh
index 75f3cd1..83c7e7b 100755
--- a/src/cargo-meson.sh
+++ b/src/cargo-meson.sh
@@ -38,7 +38,7 @@ then
 	exit $RET
 fi

-if ! cmp "$BUILD_DIR/$BUILD_TYPE/$LIBNAME" "$BUILD_DIR/libgitcore.a" >/dev/null 2>&1
+if ! cmp "$BUILD_DIR/${CARGO_BUILD_TARGET:+$CARGO_BUILD_TARGET/}$BUILD_TYPE/$LIBNAME" "$BUILD_DIR/libgitcore.a" >/dev/null 2>&1
 then
-	cp "$BUILD_DIR/$BUILD_TYPE/$LIBNAME" "$BUILD_DIR/libgitcore.a"
+	cp "$BUILD_DIR/${CARGO_BUILD_TARGET:+$CARGO_BUILD_TARGET/}$BUILD_TYPE/$LIBNAME" "$BUILD_DIR/libgitcore.a"
 fi
--
2.55.0
Previous: Junio C Hamano
Message 5 of 5 in “rust: respect CARGO_BUILD_TARGET when locating build output”
  1. rust: respect CARGO_BUILD_TARGET when locating build outputJames Le Cuirot, Sep 8, 2026
  2. Junio C HamanoSep 8, 2026
  3. rust: respect CARGO_BUILD_TARGET when locating build outputJames Le Cuirot, Sep 8, 2026
  4. Junio C HamanoSep 9, 2026
  5. rust: respect CARGO_BUILD_TARGET when locating build outputJames Le Cuirot, Sep 10, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.