aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Reagan <xbjfk.github@gmail.com> 2023-09-18 07:32:20 +0000
committerGravatar GitHub <noreply@github.com> 2023-09-18 00:32:20 -0700
commit9acc081c3a25d7601d44f3249891cc258a74db55 (patch)
tree722187a5196a5e61e3dfd17f98b14e03b592aab5
parent630bbfca91de1c5568fd4bd5cd18e1c5d4ef55ef (diff)
downloadbun-9acc081c3a25d7601d44f3249891cc258a74db55.tar.gz
bun-9acc081c3a25d7601d44f3249891cc258a74db55.tar.zst
bun-9acc081c3a25d7601d44f3249891cc258a74db55.zip
Remove hardcoded references to zig in Makefile (#5660)
-rw-r--r--Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 0dec6b069..4fc13a430 100644
--- a/Makefile
+++ b/Makefile
@@ -811,7 +811,7 @@ fmt-cpp:
.PHONY: fmt-zig
fmt-zig:
- cd src && zig fmt **/*.zig
+ cd src && $(ZIG) fmt **/*.zig
.PHONY: fmt
fmt: fmt-cpp fmt-zig
@@ -945,7 +945,7 @@ headers:
$(ZIG) translate-c src/bun.js/bindings/headers.h > src/bun.js/bindings/headers.zig
$(BUN_OR_NODE) misctools/headers-cleaner.js
$(ZIG) fmt src/bun.js/bindings/headers.zig
- $(CLANG_FORMAT) -i src/bun.js/bindings/ZigGeneratedCode.cpp
+ $(CLANG_FORMAT) -i src/bun.js/bindings/ZigGeneratedCode.cpp
.PHONY: jsc-bindings-headers
jsc-bindings-headers: headers
@@ -1482,7 +1482,7 @@ bun-relink: bun-relink-copy bun-link-lld-release bun-link-lld-release-dsym
bun-relink-fast: bun-relink-copy bun-link-lld-release-no-lto
wasm-return1:
- zig build-lib -OReleaseSmall test/bun.js/wasm-return-1-test.zig -femit-bin=test/bun.js/wasm-return-1-test.wasm -target wasm32-freestanding
+ $(ZIG) build-lib -OReleaseSmall test/bun.js/wasm-return-1-test.zig -femit-bin=test/bun.js/wasm-return-1-test.wasm -target wasm32-freestanding
generate-classes:
bun src/bun.js/scripts/generate-classes.ts
@@ -1825,7 +1825,7 @@ endif
build-unit: # to build your unit tests
@rm -rf zig-out/bin/$(testname)
@mkdir -p zig-out/bin
- zig test $(realpath $(testpath)) \
+ $(ZIG) test $(realpath $(testpath)) \
$(testfilterflag) \
$(PACKAGE_MAP) \
--main-pkg-path $(BUN_DIR) \
@@ -1843,7 +1843,7 @@ build-unit: # to build your unit tests
run-all-unit-tests: # to run your unit tests
@rm -rf zig-out/bin/__main_test
@mkdir -p zig-out/bin
- zig test src/main.zig \
+ $(ZIG) test src/main.zig \
$(PACKAGE_MAP) \
--main-pkg-path $(BUN_DIR) \
--test-no-exec \