HDF5: CMAKE_CROSSCOMPILING_EMULATOR

openPMD · Mar 21, 2022 · b64e3b0 · b64e3b0
1 parent 34ba800
commit b64e3b0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -51,7 +51,6 @@ jobs:
             arch: "arm64"
             env:
               CMAKE_OSX_ARCHITECTURES: "arm64"
-              CMAKE_APPLE_SILICON_PROCESSOR: "x86_64"
               MACOSX_DEPLOYMENT_TARGET: 11.0
           # Needs extra treatment of all librarys that are not CMake controlled
           # the dependencies:
@@ -60,7 +59,6 @@ jobs:
             arch: "universal2"
             env:
               CMAKE_OSX_ARCHITECTURES: "arm64;x86_64"
-              CMAKE_APPLE_SILICON_PROCESSOR: "x86_64"
               MACOSX_DEPLOYMENT_TARGET: 11.0
 
     steps:
@@ -123,7 +121,6 @@ jobs:
         # arm64 Python interpreters are built with 11.0
         MACOSX_DEPLOYMENT_TARGET: "${{ matrix.env.MACOSX_DEPLOYMENT_TARGET }}"
         CMAKE_OSX_ARCHITECTURES: "${{ matrix.env.CMAKE_OSX_ARCHITECTURES }}"
-        CMAKE_APPLE_SILICON_PROCESSOR: "${{ matrix.env.CMAKE_APPLE_SILICON_PROCESSOR }}"
         # Show a bit more output (pip -v)
         CIBW_BUILD_VERBOSITY: 1
       run: |

diff --git a/library_builders.sh b/library_builders.sh
@@ -225,6 +225,11 @@ function build_hdf5 {
     tar -xzf hdf5*.tar.gz
     rm hdf5*.tar.gz
 
+    CMAKE_CROSSCOMPILING_EMULATOR=""
+    if [[ "${CMAKE_OSX_ARCHITECTURES-}" == "arm64" ]]; then
+        CMAKE_CROSSCOMPILING_EMULATOR="arch -x86_64"
+    fi
+
     PY_BIN=$(which python3)
     CMAKE_BIN="$(${PY_BIN} -m pip show cmake 2>/dev/null | grep Location | cut -d' ' -f2)/cmake/data/bin/"
     PATH=${CMAKE_BIN}:${PATH} cmake          \
@@ -238,6 +243,7 @@ function build_hdf5 {
       -DHDF5_BUILD_TOOLS=OFF                 \
       -DHDF5_BUILD_UTILS=OFF                 \
       -DHDF5_INSTALL_CMAKE_DIR=share/cmake/hdf5 \
+      -DCMAKE_CROSSCOMPILING_EMULATOR=${CMAKE_CROSSCOMPILING_EMULATOR} \
       -DCMAKE_INSTALL_PREFIX=${BUILD_PREFIX}
     cmake --build build-hdf5 -j ${CPU_COUNT}
     cmake --build build-hdf5 --target install