From 9596e95916d77e696db484397100587deb8a345a Mon Sep 17 00:00:00 2001 From: Oleksandr Pavlyk Date: Wed, 25 Sep 2024 07:37:01 -0500 Subject: [PATCH] fix logic to set GLIBC_MAJOR, GLIBC_MINOR variables --- conda-recipe-cf/build.sh | 3 +++ conda-recipe/build.sh | 3 +++ 2 files changed, 6 insertions(+) diff --git a/conda-recipe-cf/build.sh b/conda-recipe-cf/build.sh index 2792f27..d83d1a7 100644 --- a/conda-recipe-cf/build.sh +++ b/conda-recipe-cf/build.sh @@ -5,6 +5,9 @@ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${BUILD_PREFIX}/lib" echo "--gcc-toolchain=${BUILD_PREFIX} --sysroot=${BUILD_PREFIX}/${HOST}/sysroot -target ${HOST}" > icx_for_conda.cfg export ICXCFG="$(pwd)/icx_for_conda.cfg" +read -r GLIBC_MAJOR GLIBC_MINOR <<< "$(conda list '^sysroot_linux-64$' \ + | tail -n 1 | awk '{print $2}' | grep -oP '\d+' | head -n 2 | tr '\n' ' ')" + export CMAKE_GENERATOR="Ninja" SKBUILD_ARGS="-- -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON" diff --git a/conda-recipe/build.sh b/conda-recipe/build.sh index 2792f27..d83d1a7 100644 --- a/conda-recipe/build.sh +++ b/conda-recipe/build.sh @@ -5,6 +5,9 @@ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${BUILD_PREFIX}/lib" echo "--gcc-toolchain=${BUILD_PREFIX} --sysroot=${BUILD_PREFIX}/${HOST}/sysroot -target ${HOST}" > icx_for_conda.cfg export ICXCFG="$(pwd)/icx_for_conda.cfg" +read -r GLIBC_MAJOR GLIBC_MINOR <<< "$(conda list '^sysroot_linux-64$' \ + | tail -n 1 | awk '{print $2}' | grep -oP '\d+' | head -n 2 | tr '\n' ' ')" + export CMAKE_GENERATOR="Ninja" SKBUILD_ARGS="-- -DCMAKE_C_COMPILER:PATH=icx -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON"