feat(build): use automatic cross compile detection for configure_make

Kong · Sep 10, 2024 · e1f80db · e1f80db
1 parent ef0fc7f
commit e1f80db
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 26 deletions.
diff --git a/build/cross_deps/libxcrypt/BUILD.libxcrypt.bazel b/build/cross_deps/libxcrypt/BUILD.libxcrypt.bazel
@@ -26,19 +26,12 @@ configure_make(
     configure_command = "configure",
     configure_in_place = True,
     configure_options = select({
-        "@kong//:aarch64-linux-glibc-cross": [
-            "--host=aarch64-unknown-linux-gnu",
-        ],
-        "@kong//:x86_64-linux-glibc-cross": [
-            "--host=x86_64-unknown-linux-gnu",
-        ],
-        "//conditions:default": [],
-    }) + select({
         ":disable-obsolete-api": [
             "--enable-obsolete-api=no",
         ],
         "//conditions:default": [],
     }),
+    configure_xcompile = True,  # use automatic cross compile detection
     lib_source = ":all_srcs",
     # out_lib_dir = "lib",
     out_shared_libs = select({

diff --git a/build/cross_deps/libyaml/BUILD.libyaml.bazel b/build/cross_deps/libyaml/BUILD.libyaml.bazel
@@ -13,15 +13,7 @@ configure_make(
     name = "libyaml",
     configure_command = "configure",
     configure_in_place = True,
-    configure_options = select({
-        "@kong//:aarch64-linux-glibc-cross": [
-            "--host=aarch64-unknown-linux-gnu",
-        ],
-        "@kong//:x86_64-linux-glibc-cross": [
-            "--host=x86_64-unknown-linux-gnu",
-        ],
-        "//conditions:default": [],
-    }),
+    configure_xcompile = True,  # use automatic cross compile detection
     lib_source = ":all_srcs",
     # out_lib_dir = "lib",
     out_shared_libs = select({

diff --git a/build/libexpat/BUILD.libexpat.bazel b/build/libexpat/BUILD.libexpat.bazel
@@ -23,15 +23,8 @@ configure_make(
         "--without-xmlwf",
         "--without-examples",
         "--without-docbook",
-    ] + select({
-        "@kong//:aarch64-linux-glibc-cross": [
-            "--host=aarch64-unknown-linux-gnu",
-        ],
-        "@kong//:x86_64-linux-glibc-cross": [
-            "--host=x86_64-unknown-linux-gnu",
-        ],
-        "//conditions:default": [],
-    }),
+    ],
+    configure_xcompile = True,  # use automatic cross compile detection
     env = select({
         "@platforms//os:macos": {
             # don't use rule_foreign_cc's libtool as archiver as it seems to be a bug