From 987fd3107807c45f81a08f97bd0896eb34584ff9 Mon Sep 17 00:00:00 2001
From: Brandt Bucher <brandt@python.org>
Date: Sun, 16 Jul 2023 17:23:05 -0700
Subject: [PATCH] The struggle continues...

---
 .github/workflows/jit.yml |  1 -
 Tools/justin/build.py     | 10 ++++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/jit.yml b/.github/workflows/jit.yml
index 29959a7bc010c2..ef43b87d0e6a6f 100644
--- a/.github/workflows/jit.yml
+++ b/.github/workflows/jit.yml
@@ -105,7 +105,6 @@ jobs:
           run: |
             echo "::group::Configure Python"
             export PATH="$(llvm-config-${{ matrix.llvm }} --bindir):$PATH"
-            ls "$(llvm-config-${{ matrix.llvm }} --bindir)"
             ./configure ${{ matrix.debug && '--with-pydebug' || '--enable-optimizations --with-lto' }}
             echo "::endgroup::"
             echo "::group::Build Python"
diff --git a/Tools/justin/build.py b/Tools/justin/build.py
index 93e5349f9b567b..ee6de37b9ce434 100644
--- a/Tools/justin/build.py
+++ b/Tools/justin/build.py
@@ -168,13 +168,13 @@ def get_llvm_tool_version(name: str) -> int | None:
         process = subprocess.run(args, check=True, stdout=subprocess.PIPE)
     except FileNotFoundError:
         return None
+    print(name, process.stdout)  # XXX
     match = re.search(br"version\s+(\d+)\.\d+\.\d+\s+", process.stdout)
     return match and int(match.group(1))
 
 def find_llvm_tool(tool: str) -> tuple[str, int]:
     versions = {14, 15, 16}
     forced_version = os.getenv("PYTHON_LLVM_VERSION")
-    print(versions, forced_version)  # XXX
     if forced_version:
         versions &= {int(forced_version)}
     # Unversioned executables:
@@ -185,7 +185,6 @@ def find_llvm_tool(tool: str) -> tuple[str, int]:
     for version in sorted(versions, reverse=True):
         # Versioned executables:
         path = f"{tool}-{version}"
-        print(path, get_llvm_tool_version(path))  # XXX
         if get_llvm_tool_version(path) == version:
             return path, version
         # My homebrew homies:
@@ -1087,10 +1086,9 @@ def dump(self) -> str:
         return "\n".join(lines)
 
 if __name__ == "__main__":
-    # Clang internal error with musttail + ghccc + aarch64:
-    ghccc = platform.machine() not in {"aarch64", "arm64"}
-    print(f"{platform.machine() = }")
-    engine = Compiler(verbose=True, ghccc=False)#ghccc)  # XXX: powerpc64le
+    # Clang internal error with musttail + ghccc + aarch64, and no support for ghccc + powerpc64le:
+    ghccc = platform.machine() not in {"aarch64", "arm64", "ppc64le"}
+    engine = Compiler(verbose=True, ghccc=ghccc)
     asyncio.run(engine.build())
     with open(sys.argv[2], "w") as file:
         file.write(engine.dump())
\ No newline at end of file