Update compiler to C++

Signed-off-by: Patrick Avery <[email protected]>
HEXRD · Nov 21, 2023 · c82fbdc · c82fbdc
1 parent 693d1b6
commit c82fbdc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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]