aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jarred Sumner <jarred@jarredsumner.com> 2021-10-15 22:52:24 -0700
committerGravatar Jarred Sumner <jarred@jarredsumner.com> 2021-10-15 22:52:24 -0700
commit44108d6a26a1820f2a54716037e33fd5d17b3998 (patch)
treef2cf074c245ce75b605fe9da9c8b71181c9753be
parentc7fb978b7b06092d8ff5e49508854504cbedc307 (diff)
downloadbun-44108d6a26a1820f2a54716037e33fd5d17b3998.tar.gz
bun-44108d6a26a1820f2a54716037e33fd5d17b3998.tar.zst
bun-44108d6a26a1820f2a54716037e33fd5d17b3998.zip
Fix static libarchive build
-rw-r--r--Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 03bb2de55..4199b494b 100644
--- a/Makefile
+++ b/Makefile
@@ -293,9 +293,12 @@ vendor-without-check: api analytics node-fallbacks runtime_js fallback_decoder b
libarchive:
cd src/deps/libarchive; \
- cmake . -DLIBICONV_PATH="$(LIBICONV_PATH)"" -DLIBICONV_STATIC=ON -DENABLE_ZLIB=OFF -DENABLE_OPENSSL=OFF; \
+ (make clean || echo ""); \
+ ./build/clean.sh; \
+ ./build/autogen.sh; \
+ ./configure --disable-shared --enable-static --with-pic --disable-bsdtar --disable-bsdcat --disable-rpath --enable-posix-regex-lib --without-xml2 --without-expat --without-openssl --without-iconv --without-zlib; \
make -j${CPUS}; \
- cp libarchive/libarchive.a $(DEPS_DIR)/libarchive.a;
+ cp .libs/libarchive.a/libarchive.a $(DEPS_DIR)/libarchive.a;
tgz:
zig build-exe -Drelease-fast --main-pkg-path $(shell pwd) ./misctools/tgz.zig $(DEPS_DIR)/zlib/libz.a $(DEPS_DIR)/libarchive.a $(LIBICONV_PATH) -lc