From 1ef38843b009ca90fbc4852f97ab140c080e2a4d Mon Sep 17 00:00:00 2001
From: John Demme <john.demme@microsoft.com>
Date: Fri, 17 May 2024 23:05:53 +0000
Subject: [PATCH] pipeline debug

---
 .github/workflows/pycdePublish.yml |  4 +---
 frontends/PyCDE/setup.py           | 11 ++++++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/pycdePublish.yml b/.github/workflows/pycdePublish.yml
index fb235b025423..6afb91594b57 100644
--- a/.github/workflows/pycdePublish.yml
+++ b/.github/workflows/pycdePublish.yml
@@ -128,10 +128,8 @@ jobs:
           RUN_TESTS: False
           COMPILER_PREFIX: sccache
         run: |
-          export PATH=$PATH:$HOME/.local/bin
-
           echo "Building wheel"
-          cibuildwheel --output-dir wheelhouse frontends/PyCDE
+          python3 -m cibuildwheel --output-dir wheelhouse frontends/PyCDE
       - name: Upload Binary
         uses: actions/upload-artifact@v4
         with:
diff --git a/frontends/PyCDE/setup.py b/frontends/PyCDE/setup.py
index 4104b975e122..c0ebd3944420 100644
--- a/frontends/PyCDE/setup.py
+++ b/frontends/PyCDE/setup.py
@@ -72,10 +72,14 @@ def run(self):
     prefix = os.getenv("COMPILER_PREFIX", "")
     if prefix != "":
       prefix += " "
+    cc = "gcc"
     if "CC" in os.environ:
-      cmake_args += [f"-DCMAKE_C_COMPILER=\"{prefix}{os.environ['CC']}\""]
+      cc = os.environ["CC"]
+    cmake_args += [f"-DCMAKE_C_COMPILER={prefix}{cc}"]
+    cxx = "g++"
     if "CXX" in os.environ:
-      cmake_args += [f"-DCMAKE_CXX_COMPILER=\"{prefix}{os.environ['CXX']}\""]
+      cxx = os.environ["CXX"]
+    cmake_args += [f"-DCMAKE_CXX_COMPILER={prefix}{cxx}"]
 
     if "CIRCT_EXTRA_CMAKE_ARGS" in os.environ:
       cmake_args += os.environ["CIRCT_EXTRA_CMAKE_ARGS"].split(" ")
@@ -91,7 +95,8 @@ def run(self):
     cmake_cache_file = os.path.join(cmake_build_dir, "CMakeCache.txt")
     if os.path.exists(cmake_cache_file):
       os.remove(cmake_cache_file)
-    print(f"Running cmake with args: {cmake_args}", file=sys.stderr)
+    subprocess.check_call(["echo", "cmake", src_dir] + cmake_args,
+                          cwd=cmake_build_dir)
     subprocess.check_call(["cmake", src_dir] + cmake_args, cwd=cmake_build_dir)
     subprocess.check_call([
         "cmake",