From 6d173539348f45e424b38812de807c49694bf002 Mon Sep 17 00:00:00 2001 From: Frederic Boudon Date: Tue, 23 Jan 2024 10:50:00 +0100 Subject: [PATCH] set stdinc++ back --- .github/workflows/conda-package-build.yml | 4 ++-- pyproject-linux.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/conda-package-build.yml b/.github/workflows/conda-package-build.yml index a15c4e7..e437257 100644 --- a/.github/workflows/conda-package-build.yml +++ b/.github/workflows/conda-package-build.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest , macos-latest , windows-latest] + os: [ ubuntu-latest ] #, macos-latest , windows-latest] python-minor-version: [8, 9, 10, 11] isMaster: - ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/dev') }} @@ -44,7 +44,7 @@ jobs: python-minor-version: 10 steps: - - name: Chekout + - name: Checkout uses: actions/checkout@v3 - name: Determine publish uses: haya14busa/action-cond@v1 diff --git a/pyproject-linux.toml b/pyproject-linux.toml index ea7472d..667f134 100644 --- a/pyproject-linux.toml +++ b/pyproject-linux.toml @@ -22,7 +22,7 @@ libraries = ['QGLViewer','GLU'] tags = ['QGLViewer_2_9_1'] #include-dirs=['${CONDA_PREFIX}/include','${PREFIX}/include'] #library-dirs=['${CONDA_PREFIX}/lib','${PREFIX}/lib'] -extra-compile-args=['-I${CONDA_PREFIX}/include','-I${PREFIX}/include','-I${BUILD_PREFIX}/${HOST}/sysroot/usr/include','-nostdinc++','--sysroot=${BUILD_PREFIX}/${HOST}/sysroot'] +extra-compile-args=['-I${CONDA_PREFIX}/include','-I${PREFIX}/include','-I${BUILD_PREFIX}/${HOST}/sysroot/usr/include','--sysroot=${BUILD_PREFIX}/${HOST}/sysroot'] extra-link-args=['-L${CONDA_PREFIX}/lib','-L${PREFIX}/lib','--sysroot=${BUILD_PREFIX}/${HOST}/sysroot'] [tool.sip.project]