Fix Ninja extraction

dr8co · May 30, 2024 · 773fb68 · 773fb68
1 parent b62034d
commit 773fb68
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml
@@ -80,7 +80,7 @@ jobs:
           cmake -B ${{ steps.strings.outputs.build-output-dir }}
           -DCMAKE_CXX_COMPILER=/opt/homebrew/opt/llvm/bin/clang++
           -DCMAKE_C_COMPILER=/opt/homebrew/opt/llvm/bin/clang
-          -DCMAKE_CXX_FLAGS="-I/opt/homebrew/opt/gcc@14/include/c++/14 -I/opt/homebrew/opt/gcc@14/include/c++/14/x86_64-apple-darwin* -L/opt/homebrew/opt/gcc@14/lib/gcc/14 -Wl,-rpath,/opt/homebrew/opt/gcc@14/lib/gcc/14 -stdlib=libstdc++"
+          -DCMAKE_CXX_FLAGS="-I/opt/homebrew/opt/gcc@14/include/c++/14 -I/opt/homebrew/opt/gcc@14/include/c++/14/* -L/opt/homebrew/opt/gcc@14/lib/gcc/14 -Wl,-rpath,/opt/homebrew/opt/gcc@14/lib/gcc/14 -stdlib=libstdc++"
           -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
           -S ${{ github.workspace }} -G Xcode
 

diff --git a/CMakeModules/FindReadline.cmake b/CMakeModules/FindReadline.cmake
@@ -69,7 +69,14 @@ if (NOT READLINE_FOUND AND APPLE)
     # Find library manually
     find_library(READLINE_LIBRARY REQUIRED
             NAMES libreadline.dylib libreadline.a
-            PATHS /usr/local/opt/readline/lib /usr/local/lib /opt/local/lib /usr/lib /opt/homebrew/lib /opt/homebrew/Cellar/readline
+            PATHS
+            /usr/local/opt/readline/lib
+            /usr/local/lib
+            /opt/local/lib
+            /usr/lib
+            /opt/homebrew/lib
+            /opt/homebrew/opt/readline/lib
+            /opt/homebrew/Cellar/readline/*/lib
             NO_DEFAULT_PATH
     )
 

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -44,7 +44,8 @@ function install_dependencies() {
     apt remove -y --purge --auto-remove ninja-build
   fi
 
-  wget -qO- "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-linux.zip" | funzip > /usr/local/bin/ninja
+  wget -qO- "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-linux.zip"
+  unzip ninja-linux.zip -d /usr/local/bin
 }
 
 function build_blake3() {