diff options
| author |  Silver <14016168+silversquirl@users.noreply.github.com>
| 2023-04-27 05:57:25 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2023-04-26 21:57:25 -0700 |
| commit | 3a203abc103212bccd487d0c979f93a6b5e2badb (patch) | |
| tree | ab27ed9c3ccc887005024205bbfe07ab6c8f46c0 | |
| parent | 75e3546f3a78cc504a7002a636d2654b598f8ff9 (diff) | |
| download | bun-3a203abc103212bccd487d0c979f93a6b5e2badb.tar.gz bun-3a203abc103212bccd487d0c979f93a6b5e2badb.tar.zst bun-3a203abc103212bccd487d0c979f93a6b5e2badb.zip | |
Use Ninja to build mimalloc and gitignore test/bun.lockb (#2750)
* build: use ninja to build mimalloc
This is both faster than make, and ensures the same generator is
always used, even when CMAKE_GENERATOR exists in the environment.
* chore: gitignore test/bun.lockb
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | test/.gitignore | 1 |
2 files changed, 5 insertions, 2 deletions
@@ -1320,8 +1320,9 @@ mimalloc-debug: -DMI_OVERRIDE=OFF \ -DCMAKE_C_FLAGS="$(CFLAGS)" \ -DCMAKE_CXX_FLAGS="$(CFLAGS)" \ + -GNinja . \ - && make -j $(CPUS); + && ninja; cp $(BUN_DEPS_DIR)/mimalloc/$(_MIMALLOC_DEBUG_FILE) $(BUN_DEPS_OUT_DIR)/$(MIMALLOC_FILE) @@ -1343,8 +1344,9 @@ mimalloc: -DMI_OVERRIDE=OFF \ -DMI_OSX_ZONE=OFF \ -DCMAKE_C_FLAGS="$(CFLAGS)" \ + -GNinja \ .\ - && make -j $(CPUS); + && ninja; cp $(BUN_DEPS_DIR)/mimalloc/$(MIMALLOC_INPUT_PATH) $(BUN_DEPS_OUT_DIR)/$(MIMALLOC_FILE) diff --git a/test/.gitignore b/test/.gitignore new file mode 100644 index 000000000..60f986255 --- /dev/null +++ b/test/.gitignore @@ -0,0 +1 @@ +bun.lockb |