Merge #1317

1317: Re-add PKG_CONFIG_PATH for armhf image r=Emilgardis a=kingosticks It doesn't hurt to have this also defined for arm-unknown-linux-gnueabihf despite apt package installation being disabled by default for this platform. Fixes #1316 Co-authored-by: Nick Steel <nick@nsteel.co.uk>
cross-rs · Aug 23, 2023 · a599f20 · a599f20
2 parents 37c681a + 47b1d38
commit a599f20
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/.changes/1317.json b/.changes/1317.json
@@ -0,0 +1,6 @@
+{
+  "description": "Re-add PKG_CONFIG_PATH for the arm-unknown-linux-gnueabihf target.",
+  "issues": [1316],
+  "type": "fixed",
+  "breaking": false
+}
diff --git a/docker/Dockerfile.arm-unknown-linux-gnueabihf b/docker/Dockerfile.arm-unknown-linux-gnueabihf
@@ -38,6 +38,7 @@ ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc
     BINDGEN_EXTRA_CLANG_ARGS_arm_unknown_linux_gnueabihf="--sysroot=$CROSS_SYSROOT" \
     QEMU_LD_PREFIX="$CROSS_SYSROOT" \
     RUST_TEST_THREADS=1 \
+    PKG_CONFIG_PATH="/usr/lib/arm-linux-gnueabihf/pkgconfig/:${PKG_CONFIG_PATH}" \
     CROSS_CMAKE_SYSTEM_NAME=Linux \
     CROSS_CMAKE_SYSTEM_PROCESSOR=arm \
     CROSS_CMAKE_CRT=gnu \