diff options
| author |  Jarred Sumner <jarred@jarredsumner.com>
| 2021-10-29 23:41:43 -0700 |
|---|---|---|
| committer | Jarred Sumner <jarred@jarredsumner.com>
| 2021-10-29 23:41:43 -0700 |
| commit | c51dac1282b2a24b99258dbfe37e29d355d3e47e (patch) | |
| tree | ad8fbc679679682e2693022aba4bc74d085b7d6e | |
| parent | 0d002c705728c432a2ee3ba24d78b5d8a823adaf (diff) | |
| download | bun-c51dac1282b2a24b99258dbfe37e29d355d3e47e.tar.gz bun-c51dac1282b2a24b99258dbfe37e29d355d3e47e.tar.zst bun-c51dac1282b2a24b99258dbfe37e29d355d3e47e.zip | |
[internal] Fix build issue with the JavaScriptCore bindings on macOS. GNU sed != BSD sed
| -rw-r--r-- | Makefile | 21 |
1 files changed, 13 insertions, 8 deletions
@@ -31,10 +31,12 @@ BUN_RELEASE_BIN = $(PACKAGE_DIR)/bun # We must use the same compiler version for the JavaScriptCore bindings and JavaScriptCore # If we don't do this, strange memory allocation failures occur. # This is easier to happen than you'd expect. - CC = $(shell which clang-12 || which clang) CXX = $(shell which clang++-12 || which clang++) +# macOS sed is different +SED = $(shell which gsed || which sed) + DEPS_DIR = $(shell pwd)/src/deps CPUS ?= $(shell nproc) USER ?= $(echo $USER) @@ -460,13 +462,13 @@ jsc-bindings-headers: /tmp/build-jsc-headers zig translate-c src/javascript/jsc/bindings/headers.h > src/javascript/jsc/bindings/headers.zig zig run misctools/headers-cleaner.zig -lc - sed -i '/pub const int/d' src/javascript/jsc/bindings/headers.zig || echo ""; - sed -i '/pub const uint/d' src/javascript/jsc/bindings/headers.zig || echo ""; - sed -i '/pub const intmax/d' src/javascript/jsc/bindings/headers.zig || echo ""; - sed -i '/pub const uintmax/d' src/javascript/jsc/bindings/headers.zig || echo ""; - sed -i '/pub const max_align_t/{N;N;N;d;}' src/javascript/jsc/bindings/headers.zig - sed -i '/pub const ZigErrorCode/d' src/javascript/jsc/bindings/headers.zig - sed -i '/pub const JSClassRef/d' src/javascript/jsc/bindings/headers.zig + $(SED) -i '/pub const int/d' src/javascript/jsc/bindings/headers.zig || echo ""; + $(SED) -i '/pub const uint/d' src/javascript/jsc/bindings/headers.zig || echo ""; + $(SED) -i '/pub const intmax/d' src/javascript/jsc/bindings/headers.zig || echo ""; + $(SED) -i '/pub const uintmax/d' src/javascript/jsc/bindings/headers.zig || echo ""; + $(SED) -i '/pub const max_align_t/{N;N;N;d;}' src/javascript/jsc/bindings/headers.zig + $(SED) -i '/pub const ZigErrorCode/d' src/javascript/jsc/bindings/headers.zig + $(SED) -i '/pub const JSClassRef/d' src/javascript/jsc/bindings/headers.zig zig fmt src/javascript/jsc/bindings/headers.zig @@ -474,6 +476,9 @@ bump: expr $(BUILD_ID) + 1 > build-id +identifier-cache: + zig run src/js_lexer/identifier_data.zig + tag: git tag $(BUN_BUILD_TAG) git push --tags |