Merge pull request #2232 from davidhewitt/cross-compile-panic

pyo3-build-config: fix windows "cross-compile" panic

.github/workflows/ci.yml

@@ -247,6 +247,18 @@ jobs:
           manylinux: auto
           args: --release -i python3.9 --no-sdist -m examples/maturin-starter/Cargo.toml
 
+      - run: sudo rm -rf examples/maturin-starter/target
+        if: ${{ matrix.platform.os == 'ubuntu-latest' && matrix.python-version == '3.9' }}
+      - name: Test cross compile to same architecture
+        if: ${{ matrix.platform.os == 'ubuntu-latest' && matrix.python-version == '3.9' }}
+        uses: messense/maturin-action@v1
+        env:
+          PYO3_CROSS_LIB_DIR: /opt/python/cp39-cp39/lib
+        with:
+          target: x86_64-unknown-linux-gnu
+          manylinux: auto
+          args: --release -i python3.9 --no-sdist -m examples/maturin-starter/Cargo.toml
+
       - name: Test cross compilation
         if: ${{ matrix.platform.os == 'macos-latest' && matrix.python-version == '3.9' }}
         uses: messense/maturin-action@v1

CHANGELOG.md

@@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Panic during compilation when `PYO3_CROSS_LIB_DIR` is set for some host/target combinations. [#2232](https://github.com/PyO3/pyo3/pull/2232)
+
 ## [0.16.2] - 2022-03-15
 
 ### Packaging

pyo3-build-config/src/errors.rs

@@ -2,8 +2,7 @@
 #[macro_export]
 #[doc(hidden)]
 macro_rules! bail {
-    ($msg: expr) => { return Err($msg.into()) };
-    ($fmt: literal $($args: tt)+) => { return Err(format!($fmt $($args)+).into()) };
+    ($($args: tt)+) => { return Err(format!($($args)+).into()) };
 }
 
 /// A simple macro for checking a condition. Resembles anyhow::ensure.