Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use CONDA_PREFIX instead of BUILD_PREFIX for non conda-build usage #96

Merged
merged 1 commit into from
Mar 15, 2023
Merged

use CONDA_PREFIX instead of BUILD_PREFIX for non conda-build usage #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions recipe/activate-clang.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down