From a45773466416202735f4e63ee45ce365798b4e75 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 24 Oct 2024 14:55:17 +1100 Subject: [PATCH] Added /usr/local/lib64 to library directories on 64-bit --- .github/workflows/wheels-dependencies.sh | 4 ---- setup.py | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index 97c1adf098a..df2b316243e 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -44,10 +44,6 @@ function build_brotli { (cd $out_dir \ && $cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX -DCMAKE_INSTALL_NAME_DIR=$BUILD_PREFIX/lib . \ && make install) - if [[ "$MB_ML_LIBC" == "manylinux" ]]; then - cp /usr/local/lib64/libbrotli* /usr/local/lib - cp /usr/local/lib64/pkgconfig/libbrotli* /usr/local/lib/pkgconfig - fi } function build_harfbuzz { diff --git a/setup.py b/setup.py index def3417845d..6241f742fac 100644 --- a/setup.py +++ b/setup.py @@ -646,6 +646,8 @@ def build_extensions(self) -> None: # standard locations if not self.disable_platform_guessing: _add_directory(library_dirs, "/usr/local/lib") + if struct.calcsize("l") == 8: + _add_directory(library_dirs, "/usr/local/lib64") _add_directory(include_dirs, "/usr/local/include") _add_directory(library_dirs, "/usr/lib")