From 249054e5427023344c1906afde0e9073714d1930 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 16 Mar 2026 12:41:12 -0500 Subject: [PATCH] Don't use `lib64` dir for libxml2 (#617) Currently LLDB binaries as-is don't work, and this should fix them. --- cmake/wasi-sdk-toolchain.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cmake/wasi-sdk-toolchain.cmake b/cmake/wasi-sdk-toolchain.cmake index d433b9c..5468d93 100644 --- a/cmake/wasi-sdk-toolchain.cmake +++ b/cmake/wasi-sdk-toolchain.cmake @@ -173,6 +173,12 @@ if(WASI_SDK_LLDB) list(APPEND libxml_cmake_args -DLIBXML2_WITH_ICONV=OFF) endif() + # Our AlmaLinux:8 container ends up using `lib64` instead of `lib` by default + # which doesn't match LLVM, so specifically use the same dir as LLVM. + if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") + list(APPEND libxml_cmake_args -DCMAKE_INSTALL_LIBDIR=lib) + endif() + if (WASI_SDK_LIBXML2) ExternalProject_Add(libxml2 URL https://download.gnome.org/sources/libxml2/2.15/libxml2-2.15.2.tar.xz