aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Travis Pulley <travis@pulley.org> 2022-07-15 16:42:53 -0700
committerGravatar GitHub <noreply@github.com> 2022-07-15 16:42:53 -0700
commit9a7874a680dc8846628b11b923f0096e7d3dadfe (patch)
tree2e030ddf0d7318df29de0cb2ee15d59e775b74b9
parent5c2ec9cad249002185dbc86f7b75d26b3acd6bb5 (diff)
downloadbun-9a7874a680dc8846628b11b923f0096e7d3dadfe.tar.gz
bun-9a7874a680dc8846628b11b923f0096e7d3dadfe.tar.zst
bun-9a7874a680dc8846628b11b923f0096e7d3dadfe.zip
minor edit: Makefile (#672)
* minor edit: Makefile Fixed a suggested command when ninja isn't found to the correct package name * Makefile: minor edit Ninja build has different names in different package managers. This handles both known instances. * Makefile: ninja package name suggestion When checking requirements, ninja build has a different name for brew and ubuntu/debian. This handles both.
Diffstat (limited to '')
-rw-r--r--Makefile8
1 files changed, 7 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 4a990df04..dddb75031 100644
--- a/Makefile
+++ b/Makefile
@@ -518,6 +518,12 @@ docker-push-base:
docker tag bun-base-with-args ghcr.io/jarred-sumner/bun-base-with-args:latest
docker push ghcr.io/jarred-sumner/bun-base-with-args:latest
+
+ifeq ($(POSIX_PKG_MANAGER), brew)
+PKGNAME_NINJA := ninja
+else
+PKGNAME_NINJA := ninja-build
+endif
require:
@echo "Checking if the required utilities are available..."
@@ -528,7 +534,7 @@ require:
@go version >/dev/null 2>&1 || (echo -e "ERROR: go is required."; exit 1)
@which aclocal > /dev/null || (echo -e "ERROR: automake is required. Install with:\n\n $(POSIX_PKG_MANAGER) install automake"; exit 1)
@which $(LIBTOOL) > /dev/null || (echo -e "ERROR: libtool is required. Install with:\n\n $(POSIX_PKG_MANAGER) install libtool"; exit 1)
- @which ninja > /dev/null || (echo -e "ERROR: Ninja is required. Install with:\n\n $(POSIX_PKG_MANAGER) install ninja"; exit 1)
+ @which ninja > /dev/null || (echo -e "ERROR: Ninja is required. Install with:\n\n $(POSIX_PKG_MANAGER) install $(PKGNAME_NINJA)"; exit 1)
@echo "You have the dependencies installed! Woo"
init-submodules: