From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Patrick Steinhardt <ps@pks.im>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH 4/4] ci(gitlab,windows): provide GNU Rust's host-linker support
Date: Sat, 19 Sep 2026 12:12:13 +0000 [thread overview]
Message-ID: <1ed79f00cf72b2d5f2e5f55bb11de51dceeeb2bb.1789819933.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.2233.git.1789819933.gitgitgadget@gmail.com>
From: Johannes Schindelin <johannes.schindelin@gmx.de>
GitLab's MinGW job cannot find `x86_64-w64-mingw32-gcc` when linking
gitcore's build script:
https://gitlab.com/dscho/git1/-/jobs/16593470275
Although gitcore is a static library, Cargo first links `build.rs`
as a host executable. We omitted the GNU MSI's `Gcc` feature, which
supplies the required linker and platform libraries:
https://github.com/rust-lang/rust/blob/1.96.0/src/etc/installer/msi/rust.wxs
Assisted-by: GPT-6
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
ci/install-dependencies.ps1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ci/install-dependencies.ps1 b/ci/install-dependencies.ps1
index f6868dc670..9b833b9370 100755
--- a/ci/install-dependencies.ps1
+++ b/ci/install-dependencies.ps1
@@ -49,7 +49,7 @@ $rustMsi = Get-Installer "rust-$rustTarget.msi" (
"https://static.rust-lang.org/dist/" +
"rust-$RustVersion-x86_64-pc-windows-$rustTarget.msi")
Invoke-Installer msiexec.exe @('/i', $rustMsi, 'INSTALLDIR=C:\Rust',
- 'ADDLOCAL=Rustc,Cargo,Std', '/quiet', '/norestart')
+ "ADDLOCAL=Rustc,Cargo,Std$(if ($Mingw) { ',Gcc' })", '/quiet', '/norestart')
if ($Mingw) {
return
--
gitgitgadget
next prev parent reply other threads:[~2026-09-19 12:12 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-19 12:12 [PATCH 0/4] gitlab-ci: fix the cargo invocation in the Windows job Johannes Schindelin via GitGitGadget
2026-09-19 12:12 ` [PATCH 1/4] ci(gitlab,windows): provision GNU Rust for SDK-based MinGW builds Johannes Schindelin via GitGitGadget
2026-09-24 11:21 ` Patrick Steinhardt
2026-09-24 19:26 ` Johannes Schindelin
2026-09-19 12:12 ` [PATCH 2/4] ci(gitlab,windows): preserve exclusions during dependency setup Johannes Schindelin via GitGitGadget
2026-09-24 11:21 ` Patrick Steinhardt
2026-09-19 12:12 ` [PATCH 3/4] ci(gitlab,windows): fix Rust setup for GitLab's MinGW build Johannes Schindelin via GitGitGadget
2026-09-24 11:22 ` Patrick Steinhardt
2026-09-24 19:55 ` Johannes Schindelin
2026-09-28 6:50 ` Patrick Steinhardt
2026-09-28 14:33 ` Junio C Hamano
2026-09-19 12:12 ` Johannes Schindelin via GitGitGadget [this message]
2026-09-24 11:22 ` [PATCH 4/4] ci(gitlab,windows): provide GNU Rust's host-linker support Patrick Steinhardt
2026-09-24 19:57 ` Johannes Schindelin
2026-09-19 13:37 ` [PATCH 0/4] gitlab-ci: fix the cargo invocation in the Windows job Karthik Nayak
2026-09-20 15:27 ` Johannes Schindelin
2026-09-21 14:03 ` Karthik Nayak
2026-09-22 11:50 ` Johannes Schindelin
2026-09-23 12:43 ` Karthik Nayak
2026-09-24 20:01 ` [PATCH v2 " Johannes Schindelin via GitGitGadget
2026-09-24 20:01 ` [PATCH v2 1/4] ci(gitlab,windows): provision GNU Rust for SDK-based MinGW builds Johannes Schindelin via GitGitGadget
2026-09-24 20:01 ` [PATCH v2 2/4] ci(gitlab,windows): preserve exclusions during dependency setup Johannes Schindelin via GitGitGadget
2026-09-24 20:01 ` [PATCH v2 3/4] ci(gitlab,windows): fix Rust setup for GitLab's MinGW build Johannes Schindelin via GitGitGadget
2026-09-24 20:01 ` [PATCH v2 4/4] ci(gitlab,windows): provide GNU Rust's host-linker support Johannes Schindelin via GitGitGadget
2026-09-28 6:50 ` [PATCH v2 0/4] gitlab-ci: fix the cargo invocation in the Windows job Patrick Steinhardt
2026-09-28 13:41 ` Johannes Schindelin
2026-09-28 14:26 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1ed79f00cf72b2d5f2e5f55bb11de51dceeeb2bb.1789819933.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=ps@pks.im \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox