aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile15
-rw-r--r--README.md6
2 files changed, 8 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index 6b3f1c7e9..782e23a77 100644
--- a/Makefile
+++ b/Makefile
@@ -335,13 +335,14 @@ zlib:
require:
@echo "Checking if the required utilities are available..."
- @cmake --version >/dev/null 2>&1 || (echo "ERROR: cmake is required."; exit 1)
- @esbuild --version >/dev/null 2>&1 || (echo "ERROR: esbuild is required."; exit 1)
- @npm --version >/dev/null 2>&1 || (echo "ERROR: npm is required."; exit 1)
- @aclocal 2>&1 || (echo "ERROR: automake is required. Install on mac with:\nbrew install automake"; exit 1)
- @glibtoolize 2>&1 || (echo "ERROR: libtool is required. Install on mac with:\nbrew install libtool"; exit 1)
- @stat $(LIBICONV_PATH) >/dev/null 2>&1 || (echo "ERROR: libiconv is required. Please:\nbrew install libiconv"; exit 1)
- @stat $(LIBCRYPTO_STATIC_LIB) >/dev/null 2>&1 || (echo "ERROR: OpenSSL 1.1 is required. Please:\nbrew install openssl@1.1"; exit 1)
+ @cmake --version >/dev/null 2>&1 || (echo -e "ERROR: cmake is required."; exit 1)
+ @esbuild --version >/dev/null 2>&1 || (echo -e "ERROR: esbuild is required."; exit 1)
+ @npm --version >/dev/null 2>&1 || (echo -e "ERROR: npm is required."; exit 1)
+ @which aclocal > /dev/null || (echo -e "ERROR: automake is required. Install on mac with:\nbrew install automake"; exit 1)
+ @which glibtoolize > /dev/null || (echo -e "ERROR: libtool is required. Install on mac with:\nbrew install libtool"; exit 1)
+ @stat $(LIBICONV_PATH) >/dev/null 2>&1 || (echo -e "ERROR: libiconv is required. Please:\nbrew install libiconv"; exit 1)
+ @stat $(LIBCRYPTO_STATIC_LIB) >/dev/null 2>&1 || (echo -e "ERROR: OpenSSL 1.1 is required. Please:\nbrew install openssl@1.1"; exit 1)
+ @echo "You have the dependencies installed! Woo"
init-submodules:
git submodule update --init --recursive --progress --depth=1
diff --git a/README.md b/README.md
index d40b83ccb..7fc9211ee 100644
--- a/README.md
+++ b/README.md
@@ -918,12 +918,6 @@ Install LLVM 12 and homebrew dependencies:
brew install llvm@12 coreutils libtool cmake libiconv automake openssl@1.1
```
-You will also need esbuild (used for bundling internal library code until Bun has better support for bundling libraries):
-
-```bash
-npm install -g esbuild
-```
-
Compile Zig:
```bash