possible build fixes for linux x86_64 CI: find only the Python interp…

…reter and check for CIBUILDWHEEL in environment
wlav · Nov 7, 2023 · c8532e9 · c8532e9
1 parent 6833403
commit c8532e9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/.github/workflows/cling-wheels.yml b/.github/workflows/cling-wheels.yml
@@ -112,7 +112,6 @@ jobs:
       - name: Build wheels
         timeout-minutes: 600
         run: |
-          echo 'CPPYY_CIBW_BUILD=1' >> "$GITHUB_ENV"
           python -m cibuildwheel cling --output-dir wheelhouse
 
       - uses: actions/upload-artifact@v3

diff --git a/cling/setup.py b/cling/setup.py
@@ -150,8 +150,7 @@ def run(self):
         CMAKE_COMMAND = ['cmake', srcdir, '-Wno-dev',
                 stdcxx, '-DLLVM_ENABLE_TERMINFO=0', '-DLLVM_ENABLE_ASSERTIONS=0',
                 '-Dminimal=ON', '-Dbuiltin_cling=ON', '-Druntime_cxxmodules=OFF', '-Dbuiltin_zlib=ON']
-        print(os.environ)
-        if is_manylinux() and 'CPPYY_CIBW_BUILD' in os.environ:
+        if is_manylinux() and 'CIBUILDWHEEL' in os.environ:
             print("enabling _GLIBCXX_USE_CXX11_ABI")
             CMAKE_COMMAND.append('-DCMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=1')
         if 'darwin' in sys.platform:

diff --git a/cling/src/CMakeLists.txt b/cling/src/CMakeLists.txt
@@ -119,10 +119,10 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 #---Load some basic macros which are needed later for the confiuration and build----------------
 message(STATUS "Looking for python ...")
 set(Python_FIND_VIRTUALENV ONLY)
-find_package (Python COMPONENTS Interpreter Development)
+find_package (Python COMPONENTS Interpreter)
 if (NOT Python_FOUND)
    set(Python_FIND_VIRTUALENV STANDARD)
-   find_package (Python COMPONENTS Interpreter Development)
+   find_package (Python COMPONENTS Interpreter)
 endif()
 if (NOT Python_Interpreter_FOUND)
    message(FATAL_ERROR "Python interpreter not found and python component required")