setup ar and ranlib in toolchain

petersalomonsen · Dec 17, 2023 · 8f37aa1 · 8f37aa1
1 parent 6f8e666
commit 8f37aa1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/setup_wasi.sh b/setup_wasi.sh
@@ -4,3 +4,7 @@ curl -L https://github.com/libgit2/libgit2/archive/refs/tags/v1.7.1.tar.gz --out
 tar -xzf libgit2.tar.gz
 mv libgit2-1.7.1 libgit2
 rm libgit2.tar.gz
+rm libgit2/src/libgit2/transports/http.c
+rm libgit2/src/libgit2/streams/socket.c
+rm libgit2/src/libgit2/sysdir.c
+cp -r libgit2patchedfiles/examples/* libgit2/examples/
diff --git a/wasibuild/build.sh b/wasibuild/build.sh
@@ -8,4 +8,5 @@ if [ "$1" == "Release" ]; then
 fi
 
 cmake -DCMAKE_TOOLCHAIN_FILE=`pwd`/wasi_toolchain.cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_C_FLAGS="$EXTRA_CMAKE_C_FLAGS" -DREGEX_BACKEND=regcomp -DSONAME=OFF -DUSE_HTTPS=OFF -DBUILD_SHARED_LIBS=OFF -DUSE_THREADS=OFF -DUSE_SSH=OFF -DBUILD_CLAR=OFF -DBUILD_EXAMPLES=ON ../libgit2
-make lg2 VERBOSE=1
+make lg2
+
diff --git a/wasibuild/wasi_toolchain.cmake b/wasibuild/wasi_toolchain.cmake
@@ -8,3 +8,6 @@ set(CMAKE_C_STANDARD_INCLUDE_DIRECTORIES "${CMAKE_SYSROOT}/include")
 SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_AR "llvm-ar" CACHE FILEPATH "llvm-ar")
+set(CMAKE_RANLIB "llvm-ranlib" CACHE FILEPATH "llvm-ranlib")
+