set SYSROOT as variable

fredboudon · Jan 23, 2024 · b5ac564 · b5ac564
1 parent 6d17353
commit b5ac564
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/conda/build.sh b/conda/build.sh
@@ -11,12 +11,7 @@ then
     mv pyproject-linux.toml pyproject.toml
 
     export PATH=${PWD}:${PATH}
-
-    SYSROOT_FLAGS="-L ${BUILD_PREFIX}/${HOST}/sysroot/usr/lib64 -L ${BUILD_PREFIX}/${HOST}/sysroot/usr/lib"
-    export CFLAGS="$SYSROOT_FLAGS $CFLAGS"
-    export CXXFLAGS="$SYSROOT_FLAGS $CXXFLAGS"
-    export LDFLAGS="$SYSROOT_FLAGS $LDFLAGS"
-
+    export SYSROOT="${CONDA_BUILD_SYSROOT}"
 fi
 
 alias qmake='${CONDA_PREFIX}/bin/qmake'

diff --git a/pyproject-linux.toml b/pyproject-linux.toml
@@ -22,8 +22,8 @@ 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','--sysroot=${BUILD_PREFIX}/${HOST}/sysroot']
-extra-link-args=['-L${CONDA_PREFIX}/lib','-L${PREFIX}/lib','--sysroot=${BUILD_PREFIX}/${HOST}/sysroot']
+extra-compile-args=['-I${CONDA_PREFIX}/include','-I${PREFIX}/include','-I${BUILD_PREFIX}/${HOST}/sysroot/usr/include']
+extra-link-args=['-L${CONDA_PREFIX}/lib','-L${PREFIX}/lib']
 
 [tool.sip.project]
 sip-module="PyQt5.sip"