further building updates

Author: brunomsaraiva

pyproject.toml

@@ -203,8 +203,7 @@ test-requires = [
 manylinux-x86_64-image = "manylinux_2_28"
 before-all = "dnf install -y ocl-icd-devel opencl-headers"
 before-build = "python -m pip install --upgrade pip && python -m pip install 'scipy==1.15.*'"
-environment = { PIP_ONLY_BINARY=":all:", CFLAGS="-I/usr/include", LDFLAGS="-L/usr/lib64", CL_INC_DIR="/usr/include", CL_LIB_DIR="/usr/lib64", CL_LIBNAME="OpenCL" }
-environment-pass = ["CL_INC_DIR", "CL_LIB_DIR", "CL_LIBNAME", "CFLAGS", "LDFLAGS"]
+environment = { CFLAGS="-I/usr/include", LDFLAGS="-L/usr/lib64", CL_INC_DIR="/usr/include", CL_LIB_DIR="/usr/lib64", CL_LIBNAME="OpenCL" }
 # repair-wheel-command = "auditwheel repair -w {dest_dir} {wheel}"
 
 [tool.cibuildwheel.macos]

setup.py

@@ -185,9 +185,24 @@ def search_for_c_files_referrenced_in_pyx_text(text: str):
     # EXTRA_LING_ARGS = ["-Xpreprocessor", "-fopenmp"]
 
 elif sys.platform.startswith("linux"):
-    INCLUDE_DIRS += ["/usr/local/include", "/usr/include"]
-    LIBRARY_DIRS += ["/usr/local/lib", "/usr/lib"]
-    EXTRA_COMPILE_ARGS += ["-O3", "-march=native", "-fopenmp"]
+    # Check for OpenCL environment variables (used by cibuildwheel)
+    cl_inc_dir = os.environ.get("CL_INC_DIR", "/usr/include")
+    cl_lib_dir = os.environ.get("CL_LIB_DIR", "/usr/lib64")
+
+    INCLUDE_DIRS += ["/usr/local/include", "/usr/include", cl_inc_dir]
+    LIBRARY_DIRS += ["/usr/local/lib", "/usr/lib", "/usr/lib64", cl_lib_dir]
+
+    # Don't use -march=native in manylinux builds (breaks portability)
+    # Detect if we're in a cibuildwheel/manylinux environment
+    in_manylinux = os.environ.get(
+        "AUDITWHEEL_PLAT"
+    ) is not None or "manylinux" in os.environ.get("CIBUILDWHEEL", "")
+
+    if in_manylinux:
+        EXTRA_COMPILE_ARGS += ["-O3", "-fopenmp"]
+    else:
+        EXTRA_COMPILE_ARGS += ["-O3", "-march=native", "-fopenmp"]
+
     EXTRA_LING_ARGS += ["-fopenmp"]
 
 try: