refactor

note that this should be updated once #12986 is merged.

Author: jhheider

projects/llvm.org/mingw-w64/package.yml

@@ -24,20 +24,6 @@ distributable:
 versions:
   github: mstorsjo/llvm-mingw
 
-# llvm-mingw's host-platform tarballs cover Linux x86-64, Linux aarch64,
-# and macOS universal (x86-64 + aarch64). No Windows-host variant for
-# our purposes (we'd rather have Windows binaries be a *target*, not
-# a host).
-#
-# Hosts: linux + darwin. (Earlier rounds restricted to linux because
-# darwin failed and logs weren't externally accessible; @jhheider
-# shared the log on pkgxdev/pantry#12984 — the failure was the test
-# step invoking the compiler by bare name, which brewkit's sandbox
-# auto-fetched as a different clang. Fix below: invoke by full path.)
-platforms:
-  - linux
-  - darwin
-
 warnings:
   - vendored # we redistribute upstream prebuilt binaries
 
@@ -46,7 +32,6 @@ build:
     curl.se: "*"
     gnu.org/tar: "*"
     tukaani.org/xz: "*"
-
   env:
     linux/x86-64:
       PLATFORM: ubuntu-22.04-x86_64
@@ -56,73 +41,39 @@ build:
       PLATFORM: macos-universal
     darwin/aarch64:
       PLATFORM: macos-universal
-  script:
-    # Map our host triple → upstream's tarball naming convention,
-    # then download + extract the prebuilt binary toolchain.
-    - URL="https://github.com/mstorsjo/llvm-mingw/releases/download/{{version.raw}}/llvm-mingw-{{version.raw}}-ucrt-${PLATFORM}.tar.xz"
-    - echo "fetching $URL"
-    - curl -Lfo llvm-mingw.tar.xz "$URL"
-
-    # Copy the WHOLE prebuilt toolchain into {{prefix}}. Upstream's
-    # drivers (x86_64-w64-mingw32-clang etc.) are wrappers that call
-    # into ../lib/clang/.../bin via relative paths — already
-    # relocatable. Extract into a staging dir (keeps the downloaded
-    # tarball out of the copy) and copy everything.
-    #
-    # Copying the full tree matters: besides bin/lib/include/share,
-    # llvm-mingw ships per-target sysroots — generic-w64-mingw32/include
-    # holds the mingw headers (stdio.h & friends) and each
-    # <triple>-w64-mingw32/lib holds the import libs. Cherry-picking only
-    # bin+lib+share+include dropped those, so the cross compiler couldn't
-    # find its own headers ("'stdio.h' file not found"). This was masked
-    # on the Linux CI sandbox (its old glibc can't even load the clang,
-    # so the compile test skipped) and only bit on darwin, which runs it.
-    #
-    # brewkit doesn't pre-create {{prefix}}, so mkdir it first.
-    - rm -rf staging && mkdir -p staging "{{prefix}}"
-    - tar Jxf llvm-mingw.tar.xz --strip-components=1 -C staging
-    - cp -a staging/. "{{prefix}}/"
+    URL: https://github.com/mstorsjo/llvm-mingw/releases/download/{{version.tag}}/llvm-mingw-{{version.tag}}-ucrt
+  working-directory: ${{prefix}}
+  script: curl -Lf "$URL-${PLATFORM}.tar.xz" | tar Jxpf - --strip-components=1
 
 test:
   # winehq.org/wine is a soft dep — if present, we actually run the
   # cross-compiled .exe through wine and verify the output. If not,
   # we fall back to a PE magic-byte check. See pkgxdev/brewkit#346
   # discussion: wine in pantry would let us validate the cross-compile
   # chain end-to-end without GitHub Windows runners.
-  dependencies:
-    winehq.org: "*"
+
+  # TODO: enable after #12986 is merged
+  # dependencies:
+  #   winehq.org: "*"
   env:
     WINEDEBUG: -all
     WINEDLLOVERRIDES: "mscoree=;mshtml="
     WINEPREFIX: $PWD/.wine
-    # Pin our own bottle's binaries by full path. brewkit's test
-    # sandbox treats unfamiliar commands as external deps and routes
-    # them through `pkgx auto-fetch`, which (on darwin in earlier
-    # rounds) picked up a different clang that didn't know our mingw
-    # headers. Full path bypasses that.
-    CLANG_X86_64: "{{prefix}}/bin/x86_64-w64-mingw32-clang"
-    CLANG_AARCH64: "{{prefix}}/bin/aarch64-w64-mingw32-clang"
   script:
     # Diagnostics first — surface env + filesystem state so the
     # darwin self-hosted-runner failure (logs not externally
     # accessible) becomes visible to maintainers.
-    - |
-      echo "── env diagnostics ──"
-      echo "CLANG_X86_64=$CLANG_X86_64"
-      echo "CLANG_AARCH64=$CLANG_AARCH64"
-      echo "── filesystem check ──"
-      ls -la "$CLANG_X86_64"  2>&1 || echo "(missing: $CLANG_X86_64)"
-      ls -la "$CLANG_AARCH64" 2>&1 || echo "(missing: $CLANG_AARCH64)"
+    - command -v aarch64-w64-mingw32-clang
+    - command -v x86_64-w64-mingw32-clang
 
     # Pre-flight: can clang actually run on this host?
     # On a buster-sandbox host (glibc 2.28) clang can't load —
     # `GLIBC_2.34 not found`. Skip gracefully then.
-    - |
-      if ! "$CLANG_X86_64" --version 2>&1; then
-        echo "clang can't run on this host (likely glibc < 2.34) —"
-        echo "skipping cross-compile test, recipe install OK."
-        exit 0
-      fi
+    - if ! x86_64-w64-mingw32-clang --version 2>&1; then
+    - echo "clang can't run on this host (likely glibc < 2.34) —"
+    - echo "skipping cross-compile test, recipe install OK."
+    - exit 0
+    - fi
 
     # Cross-compile a trivial Windows binary for x86-64 and aarch64.
     - run: cp $FIXTURE hello.c
@@ -132,20 +83,15 @@ test:
           printf("Hello from native Windows cross-compile.\n");
           return 0;
         }
-    - $CLANG_X86_64  -o hello-x86_64.exe  hello.c
-    - $CLANG_AARCH64 -o hello-aarch64.exe hello.c
+    - x86_64-w64-mingw32-clang -o hello-x86_64.exe  hello.c
+    - aarch64-w64-mingw32-clang -o hello-aarch64.exe hello.c
 
     # Static signature check: PE32+ starts with "MZ" at offset 0.
     # head -c 2 reads the raw bytes; "MZ" are printable so the shell
     # capture works without any od/tr/sed gymnastics (which had subtle
     # BSD-vs-GNU output-format differences and broke on darwin).
-    - |
-      for f in hello-x86_64.exe hello-aarch64.exe; do
-        case "$(head -c 2 "$f")" in
-          MZ) echo "$f: PE/COFF DOS header OK" ;;
-          *)  echo "$f: NOT a PE binary"; exit 1 ;;
-        esac
-      done
+    - test "$(head -c 2 hello-x86_64.exe)" = "MZ"
+    - test "$(head -c 2 hello-aarch64.exe)" = "MZ"
 
     # Dynamic check: actually run the .exe through wine. We only run
     # the x86-64 binary — wine on linux/aarch64 hosts can run aarch64
@@ -154,24 +100,17 @@ test:
     #
     # WINEDLLOVERRIDES disables wine's first-run Mono/Gecko prompts;
     # WINEDEBUG silences load-time warnings. Both standard for headless.
-    - |
-      if command -v wine64 >/dev/null 2>&1; then
-        WINE=wine64
-      elif command -v wine >/dev/null 2>&1; then
-        WINE=wine
-      else
-        echo "wine not available — skipping runtime test (compile + PE-magic-check only)"
-        exit 0
-      fi
 
-    - echo "running hello-x86_64.exe under $($WINE --version)"
-    - out=$($WINE hello-x86_64.exe)
-    - 'echo "wine stdout: $out"'
-    - |
-      case "$out" in
-        "Hello from native Windows cross-compile.") echo "RUN PASS" ;;
-        *) echo "RUN FAIL: unexpected output"; exit 1 ;;
-      esac
+    # TODO: enable after #12986 is merged
+    - exit 0
+    - if command -v wine64 >/dev/null 2>&1; then
+    - WINE=wine64
+    - else
+    - WINE=wine
+    - fi
+
+    - test "$($WINE hello-x86_64.exe)" = "Hello from native Windows cross-compile."
+    - test "$($WINE hello-aarch64.exe)" = "Hello from native Windows cross-compile."
 
 provides:
   # x86_64 cross drivers