diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index fc0f8f3f2f581d1cfcded3c05982b5068604b111..3d3ddd947fd280490fbd399c3f97cc68e750ec24 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -37,7 +37,8 @@ jobs: - name: Install GCC for MacOS using Homebrew if: matrix.os == 'macos-latest' run: | - brew install gcc libomp + brew reinstall gcc@9 + brew unlink gcc brew link gcc - name: Install dependencies diff --git a/setup.py b/setup.py index 56f6392872d05e5c3f8d551b5294f82f33eb1ca8..b198a4b685025fbbe5b4df178f9dc2a27f89a350 100644 --- a/setup.py +++ b/setup.py @@ -85,21 +85,14 @@ else: if gcc is not None: os.environ["CC"] = gcc os.environ["CXX"] = gcc - os.environ["CPPFLAGS"] = os.environ["CPPFLAGS"] + " -Xpreprocessor -fopenmp" - os.environ["CFLAGS"] = os.environ["CFLAGS"] + " -I/usr/local/opt/libomp/include" - os.environ["CXXFLAGS"] = ( - os.environ["CXXFLAGS"] + " -I/usr/local/opt/libomp/include" - ) - os.environ["LDFLAGS"] = ( - os.environ["LDFLAGS"] - + " -Wl,-rpath,/usr/local/opt/libomp/lib -L/usr/local/opt/libomp/lib -lomp" - ) else: + USE_OPENMP = False print("No GCC available. Install gcc from Homebrew " "using brew install gcc.") # required arguments for default gcc of OSX compile_args.extend(["-O2", "-stdlib=libc++", "-mmacosx-version-min=10.7"]) link_args.extend(["-O2", "-stdlib=libc++", "-mmacosx-version-min=10.7"]) - elif USE_OPENMP: + + if USE_OPENMP: compile_args.append("-fopenmp") link_args.append("-fopenmp")