From dc05de19f4e21fbe49e9d3efb8fc07db20f00cf5 Mon Sep 17 00:00:00 2001 From: "Adam J. Jackson" Date: Wed, 3 Jul 2024 15:26:27 +0100 Subject: [PATCH] Pass CC into tox --- setup.py | 4 +--- tox.ini | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index cdef250b7..38ef6339c 100644 --- a/setup.py +++ b/setup.py @@ -56,15 +56,13 @@ def get_c_extension(): except FileNotFoundError: brew_prefix = None - raise Exception("AAAAAAAAAAAA Darwin build, CC=", os.environ.get("CC")) - if brew_prefix and not os.environ.get('CC'): os.environ['CC'] = '{}/opt/llvm/bin/clang'.format(brew_prefix) link_args = ['-L{}/opt/llvm/lib'.format(brew_prefix), '-fopenmp'] else: link_args = ['-fopenmp'] - compile_args = ['-fopenmp'] + compile_args = ['-fopenmp'] else: # Linux - assume gcc if CC not set diff --git a/tox.ini b/tox.ini index 0132e7eed..347dea6ec 100644 --- a/tox.ini +++ b/tox.ini @@ -8,6 +8,7 @@ skipsdist = True [testenv] changedir = tests_and_analysis/test test_command = python run_tests.py --report +passenv = CC [testenv:{py38,py39,py310,py311}] install_command =