Merge branch 'main' into guilload/parse-date-leading-trailing-whitespace

quickwit-oss · Nov 26, 2024 · 32af9e8 · 32af9e8
2 parents b119201 + 4ffbd53
commit 32af9e8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.github/actions/cross-build-binary/action.yml b/.github/actions/cross-build-binary/action.yml
@@ -43,7 +43,6 @@ runs:
         QW_COMMIT_DATE: ${{ env.QW_COMMIT_DATE }}
         QW_COMMIT_HASH: ${{ env.QW_COMMIT_HASH }}
         QW_COMMIT_TAGS: ${{ env.QW_COMMIT_TAGS }}
-
       working-directory: ./quickwit
     - name: Bundle archive
       run: |

diff --git a/quickwit/Cross.toml b/quickwit/Cross.toml
@@ -10,11 +10,18 @@ image = "quickwit/cross:x86_64-unknown-linux-gnu"
 
 [target.x86_64-unknown-linux-musl]
 image = "quickwit/cross:x86_64-unknown-linux-musl"
-RUSTFLAGS="LIB_LDFLAGS=-L/usr/lib/x86_64-linux-gnu CFLAGS=-I/usr/local/musl/include CC=musl-gcc"
 
 [target.aarch64-unknown-linux-gnu]
 image = "quickwit/cross:aarch64-unknown-linux-gnu"
 
+[target.aarch64-unknown-linux-gnu.env]
+# Fix build for transitive dependency rdkafka -> rdkafka-sys -> sasl2-sys -> krb5-src
+# Introduced by https://github.com/MaterializeInc/rust-krb5-src/pull/27
+passthrough = [
+    "krb5_cv_attr_constructor_destructor=yes",
+    "ac_cv_func_regcomp=yes",
+    "ac_cv_printf_positional=yes",
+]
+
 [target.aarch64-unknown-linux-musl]
 image = "quickwit/cross:aarch64-unknown-linux-musl"
-linker = "aarch64-linux-musl-gcc"