Skip to content

Commit ea4ac80

Browse files
committed
please.sh: accept --architecture=ucrt64 in create_sdk_artifact
create_sdk_artifact's `case "$architecture" in` ladder hard-maps x86_64 to MSYSTEM=MINGW64 / PREFIX=/mingw64, writes that into the artifact's /etc/profile, and calls make-file-list.sh with ARCH=$architecture. Against the new UCRT64 git-sdk-64 (git-for-windows/git-sdk-64#117), the resulting artifact is broken: the profile points at /mingw64/bin which doesn't exist, and the listed packages all carry the wrong Pacman prefix. Add a new ucrt64 architecture value that maps to MSYSTEM=UCRT64 and PREFIX=/ucrt64 while keeping SDK_REPO=git-sdk-64 (the SDK has not been renamed). The caller asks for the new flavor explicitly; the make-file-list.sh side already knows what ARCH=ucrt64 means after the previous commit. Auto-detection is deliberately left alone: a dual-tree SDK (one with both /mingw64 and /ucrt64) is rare enough that guessing the wrong default would be more surprising than requiring the caller to say what they want. Assisted-by: Opus 4.7 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent 6daa14f commit ea4ac80

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

please.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ bundle_pdbs () { # [--directory=<artifacts-directory] [--unpack=<directory>] [--
389389
done
390390
}
391391

392-
create_sdk_artifact () { # [--out=<directory>] [--git-sdk=<directory>] [--architecture=(x86_64|i686|aarch64|auto)] [--bitness=(32|64)] [--force] <name>
392+
create_sdk_artifact () { # [--out=<directory>] [--git-sdk=<directory>] [--architecture=(x86_64|i686|aarch64|ucrt64|auto)] [--bitness=(32|64)] [--force] <name>
393393
git_sdk_path=/
394394
output_path=
395395
force=
@@ -490,6 +490,11 @@ create_sdk_artifact () { # [--out=<directory>] [--git-sdk=<directory>] [--archit
490490
fi
491491

492492
case "$architecture" in
493+
ucrt64)
494+
MSYSTEM=UCRT64
495+
PREFIX="/ucrt64"
496+
SDK_REPO="git-sdk-64"
497+
;;
493498
x86_64)
494499
MSYSTEM=MINGW64
495500
PREFIX="/mingw64"

0 commit comments

Comments
 (0)