From 00f286ae8fd32a8b73b38d8b3008a5fbfc5be6fe Mon Sep 17 00:00:00 2001 From: pfg Date: Wed, 30 Oct 2024 17:50:08 -0700 Subject: [PATCH] Support arch arm in libatomic distro check & fix contributing docs about the error --- CONTRIBUTING.md | 2 +- cmake/Options.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e143d69342..9feff27121 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -290,7 +290,7 @@ $ xcode-select --install Bun defaults to linking `libatomic` statically, as not all systems have it. If you are building on a distro that does not have a static libatomic available, you can run the following command to enable dynamic linking: ```bash -$ bun setup -DUSE_STATIC_LIBATOMIC=OFF +$ bun run build -DUSE_STATIC_LIBATOMIC=OFF ``` The built version of Bun may not work on other systems if compiled this way. diff --git a/cmake/Options.cmake b/cmake/Options.cmake index 36137c50cb..726a94a4b4 100644 --- a/cmake/Options.cmake +++ b/cmake/Options.cmake @@ -138,7 +138,7 @@ if(CMAKE_HOST_LINUX AND NOT WIN32 AND NOT APPLE) OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET ) - if(LINUX_DISTRO MATCHES "NAME=\"(Arch|Manjaro|Artix) Linux\"|NAME=\"openSUSE Tumbleweed\"") + if(LINUX_DISTRO MATCHES "NAME=\"(Arch|Manjaro|Artix) Linux( ARM)?\"|NAME=\"openSUSE Tumbleweed\"") set(DEFAULT_STATIC_LIBATOMIC OFF) endif() endif()