From 1e6bb1ad545a124b66cdf99ceb8764822b579826 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 6 Mar 2023 17:07:41 -0600 Subject: [PATCH] use CONDA_PREFIX instead of BUILD_PREFIX for non conda-build usage --- recipe/activate-clang.sh | 12 ++++++------ recipe/meta.yaml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/recipe/activate-clang.sh b/recipe/activate-clang.sh index aabb412..575ba0f 100644 --- a/recipe/activate-clang.sh +++ b/recipe/activate-clang.sh @@ -147,12 +147,12 @@ fi if [ "@CONDA_BUILD_CROSS_COMPILATION@" = "1" ]; then _CMAKE_ARGS="${_CMAKE_ARGS} -DCMAKE_SYSTEM_NAME=Darwin -DCMAKE_SYSTEM_PROCESSOR=@UNAME_MACHINE@ -DCMAKE_SYSTEM_VERSION=@UNAME_KERNEL_RELEASE@" - _MESON_ARGS="${_MESON_ARGS} --cross-file $BUILD_PREFIX/meson_cross_file.txt" - echo "[host_machine]" > $BUILD_PREFIX/meson_cross_file.txt - echo "system = 'darwin'" >> $BUILD_PREFIX/meson_cross_file.txt - echo "cpu = '@UNAME_MACHINE@'" >> $BUILD_PREFIX/meson_cross_file.txt - echo "cpu_family = '@MESON_CPU_FAMILY@'" >> $BUILD_PREFIX/meson_cross_file.txt - echo "endian = 'little'" >> $BUILD_PREFIX/meson_cross_file.txt + _MESON_ARGS="${_MESON_ARGS} --cross-file ${CONDA_PREFIX}/meson_cross_file.txt" + echo "[host_machine]" > ${CONDA_PREFIX}/meson_cross_file.txt + echo "system = 'darwin'" >> ${CONDA_PREFIX}/meson_cross_file.txt + echo "cpu = '@UNAME_MACHINE@'" >> ${CONDA_PREFIX}/meson_cross_file.txt + echo "cpu_family = '@MESON_CPU_FAMILY@'" >> ${CONDA_PREFIX}/meson_cross_file.txt + echo "endian = 'little'" >> ${CONDA_PREFIX}/meson_cross_file.txt fi _tc_activation \ diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ef6a3a9..c844b1a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -3,7 +3,7 @@ {% endif %} {% set major_ver = version.split(".")[0] %} -{% set build_number = 0 %} +{% set build_number = 1 %} # keep build number increments for old compiler versions as necessary {% if major_ver | int < 15 %} {% set build_number = build_number + 4 %}