Try to use g++ on Macos

mwiesenberger · mwiesenberger · commit 3ede4d906a17 · 2025-06-26T14:16:49.000+02:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -21,8 +21,7 @@ jobs:
       shell: bash
       run: |
         if [[ ${{ matrix.os }} = "macos-latest" ]]; then
-          brew install llvm@19
-          export CXX=$(brew --prefix llvm@19)/bin/clang++
+          export CXX=g++
         fi
         python -m pip install --upgrade pip
         python -m pip install .[test]
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,10 +16,8 @@ include(cmake/CPM.cmake)
 set( CCCL_THRUST_DEVICE_SYSTEM "CPP")
 CPMAddPackage(
     NAME feltor
-    #GITHUB_REPOSITORY "feltor-dev/feltor"
-    #VERSION 8.2
-    GITHUB_REPOSITORY "mwiesenberger/feltor"
-    GIT_TAG clang-test
+    GITHUB_REPOSITORY "feltor-dev/feltor"
+    VERSION 8.2
     SYSTEM ON
     EXCLUDE_FROM_ALL ON
     OPTIONS "FELTOR_DG_WITH_MATRIX OFF" "FELTOR_FILE_WITH_NETCDF OFF"
diff --git a/pyproject.toml b/pyproject.toml
@@ -47,8 +47,7 @@ skip = "*-musllinux*" # Skip musllinux (conflicts with libcudacxx)
 
 [tool.bibuildwheel.macos]
 before-build= [
-    "brew install llvm@19",
-    "export CXX=$(brew --prefix llvm@19)/bin/clang++"
+    "export CXX=g++"
 ]
 
 [tool.cibuildwheel.pyodide]

Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,7 @@ skip = "-musllinux" # Skip musllinux (conflicts with libcudacxx)`
`47`	`47`
`48`	`48`	`[tool.bibuildwheel.macos]`
`49`	`49`	`before-build= [`
`50`		`- "brew install llvm@19",`
`51`		`- "export CXX=$(brew --prefix llvm@19)/bin/clang++"`
	`50`	`+ "export CXX=g++"`
`52`	`51`	`]`
`53`	`52`
`54`	`53`	`[tool.cibuildwheel.pyodide]`