From c82fbdc22cc4480f403be158297e23e3b88593ba Mon Sep 17 00:00:00 2001 From: Patrick Avery Date: Mon, 20 Nov 2023 19:12:07 -0600 Subject: [PATCH] Update compiler to C++ Signed-off-by: Patrick Avery --- .github/workflows/package.yml | 3 ++- conda.recipe/meta.yaml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index a728867b6..3a8155c35 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -50,7 +50,8 @@ jobs: conda config --set solver libmamba conda activate hexrd - conda install --override-channels -c conda-forge anaconda-client conda-build conda + # FIXME: pybind11 should not be necessary here. Remove it when we can. + conda install --override-channels -c conda-forge anaconda-client conda-build conda pybind11 # This is need to ensure ~/.profile or ~/.bashrc are used so the activate # command works. diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index a603eb86a..d625353fd 100644 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -14,7 +14,7 @@ build: requirements: build: # This is so that we can build cross-platform for osx-arm64 - - {{ compiler('c') }} + - {{ compiler('c++') }} - python {{ python }} # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] - numpy >=1.20 # [build_platform != target_platform]