diff --git a/Dockerfile b/Dockerfile index cc39802b71..6ab56dec1b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,7 @@ ARG WEBKIT_DIR=${GITHUB_WORKSPACE}/bun-webkit ARG BUN_RELEASE_DIR=${GITHUB_WORKSPACE}/bun-release ARG BUN_DEPS_OUT_DIR=${GITHUB_WORKSPACE}/bun-deps ARG BUN_DIR=${GITHUB_WORKSPACE}/bun +ARG CPU_TARGET=native FROM bitnami/minideb:bullseye as bun-base @@ -114,7 +115,7 @@ ARG BUN_DIR COPY Makefile ${BUN_DIR}/Makefile COPY src/deps/mimalloc ${BUN_DIR}/src/deps/mimalloc -ARG CPU_TARGET=native +ARG CPU_TARGET ENV CPU_TARGET=${CPU_TARGET} RUN cd ${BUN_DIR} && \ @@ -130,7 +131,7 @@ ARG WEBKIT_DIR ARG BUN_RELEASE_DIR ARG BUN_DEPS_OUT_DIR ARG BUN_DIR -ARG CPU_TARGET=native +ARG CPU_TARGET ENV CPU_TARGET=${CPU_TARGET} COPY Makefile ${BUN_DIR}/Makefile @@ -151,7 +152,7 @@ ARG WEBKIT_DIR ARG BUN_RELEASE_DIR ARG BUN_DEPS_OUT_DIR ARG BUN_DIR -ARG CPU_TARGET=native +ARG CPU_TARGET ENV CPU_TARGET=${CPU_TARGET} RUN install_packages autoconf automake libtool pkg-config @@ -172,7 +173,7 @@ ARG WEBKIT_DIR ARG BUN_RELEASE_DIR ARG BUN_DEPS_OUT_DIR ARG BUN_DIR -ARG CPU_TARGET=native +ARG CPU_TARGET ENV CPU_TARGET=${CPU_TARGET} RUN install_packages libtcc-dev && cp /usr/lib/$(uname -m)-linux-gnu/libtcc.a ${BUN_DEPS_OUT_DIR} @@ -187,7 +188,7 @@ ARG WEBKIT_DIR ARG BUN_RELEASE_DIR ARG BUN_DEPS_OUT_DIR ARG BUN_DIR -ARG CPU_TARGET=native +ARG CPU_TARGET ENV CPU_TARGET=${CPU_TARGET} COPY Makefile ${BUN_DIR}/Makefile @@ -210,7 +211,7 @@ ARG WEBKIT_DIR ARG BUN_RELEASE_DIR ARG BUN_DEPS_OUT_DIR ARG BUN_DIR -ARG CPU_TARGET=native +ARG CPU_TARGET ENV CPU_TARGET=${CPU_TARGET} COPY Makefile ${BUN_DIR}/Makefile @@ -230,7 +231,7 @@ ARG WEBKIT_DIR ARG BUN_RELEASE_DIR ARG BUN_DEPS_OUT_DIR ARG BUN_DIR -ARG CPU_TARGET=native +ARG CPU_TARGET ENV CPU_TARGET=${CPU_TARGET} COPY Makefile ${BUN_DIR}/Makefile @@ -250,7 +251,7 @@ ARG WEBKIT_DIR ARG BUN_RELEASE_DIR ARG BUN_DEPS_OUT_DIR ARG BUN_DIR -ARG CPU_TARGET=native +ARG CPU_TARGET ENV CPU_TARGET=${CPU_TARGET} COPY Makefile ${BUN_DIR}/Makefile @@ -275,7 +276,7 @@ ARG WEBKIT_DIR ARG BUN_RELEASE_DIR ARG BUN_DEPS_OUT_DIR ARG BUN_DIR -ARG CPU_TARGET=native +ARG CPU_TARGET ENV CPU_TARGET=${CPU_TARGET} COPY Makefile ${BUN_DIR}/Makefile @@ -299,7 +300,7 @@ ARG WEBKIT_DIR ARG BUN_RELEASE_DIR ARG BUN_DEPS_OUT_DIR ARG BUN_DIR -ARG CPU_TARGET=native +ARG CPU_TARGET ENV CPU_TARGET=${CPU_TARGET} WORKDIR $BUN_DIR @@ -321,7 +322,7 @@ ARG WEBKIT_DIR ARG BUN_RELEASE_DIR ARG BUN_DEPS_OUT_DIR ARG BUN_DIR -ARG CPU_TARGET=native +ARG CPU_TARGET ENV CPU_TARGET=${CPU_TARGET} WORKDIR $BUN_DIR @@ -342,7 +343,7 @@ ARG WEBKIT_DIR ARG BUN_RELEASE_DIR ARG BUN_DEPS_OUT_DIR ARG BUN_DIR -ARG CPU_TARGET=native +ARG CPU_TARGET ENV CPU_TARGET=${CPU_TARGET} WORKDIR $BUN_DIR @@ -367,7 +368,7 @@ ARG WEBKIT_DIR ARG BUN_RELEASE_DIR ARG BUN_DEPS_OUT_DIR ARG BUN_DIR -ARG CPU_TARGET=native +ARG CPU_TARGET ENV CPU_TARGET=${CPU_TARGET} COPY Makefile ${BUN_DIR}/Makefile @@ -377,7 +378,7 @@ WORKDIR $BUN_DIR ENV JSC_BASE_DIR=${WEBKIT_DIR} ENV LIB_ICU_PATH=${WEBKIT_DIR}/lib ARG ARCH=x86_64 -ARG CPU_TARGET=native +ARG CPU_TARGET ENV CPU_TARGET=${CPU_TARGET} ARG TRIPLET=${ARCH}-linux-gnu @@ -399,7 +400,7 @@ ARG WEBKIT_DIR ARG BUN_RELEASE_DIR ARG BUN_DEPS_OUT_DIR ARG BUN_DIR -ARG CPU_TARGET=native +ARG CPU_TARGET ENV CPU_TARGET=${CPU_TARGET} @@ -415,7 +416,7 @@ ARG WEBKIT_DIR ARG BUN_RELEASE_DIR ARG BUN_DEPS_OUT_DIR ARG BUN_DIR -ARG CPU_TARGET=native +ARG CPU_TARGET ENV CPU_TARGET=${CPU_TARGET} COPY Makefile ${BUN_DIR}/Makefile @@ -474,7 +475,7 @@ ARG WEBKIT_DIR ARG BUN_RELEASE_DIR ARG BUN_DEPS_OUT_DIR ARG BUN_DIR -ARG CPU_TARGET=native +ARG CPU_TARGET ENV CPU_TARGET=${CPU_TARGET} COPY Makefile ${BUN_DIR}/Makefile diff --git a/Makefile b/Makefile index dc5bb90e47..9e63f69a0a 100644 --- a/Makefile +++ b/Makefile @@ -1349,7 +1349,7 @@ endif ifeq ($(OS_NAME),linux) bun-link-lld-release-dsym: bun-release-copy-obj mv $(BUN_RELEASE_BIN).o /tmp/bun-$(PACKAGE_JSON_VERSION).o - -$(STRIP) $(BUN_RELEASE_BIN) --wildcard -K _napi\* + -$(STRIP) -s $(BUN_RELEASE_BIN) --wildcard -K _napi\* copy-to-bun-release-dir-dsym: endif diff --git a/build.zig b/build.zig index 760f27c710..855537f90c 100644 --- a/build.zig +++ b/build.zig @@ -259,6 +259,7 @@ pub fn build(b: *std.build.Builder) !void { const output_dir_base = try std.fmt.bufPrint(&output_dir_buf, "{s}{s}", .{ bin_label, triplet }); output_dir = b.pathFromRoot(output_dir_base); + std.fs.cwd().makePath(output_dir) catch {}; const bun_executable_name = if (mode == std.builtin.Mode.Debug) "bun-debug" else "bun"; exe = b.addExecutable(bun_executable_name, if (target.getOsTag() == std.Target.Os.Tag.freestanding) "src/main_wasm.zig" @@ -547,7 +548,7 @@ pub fn linkObjectFiles(b: *std.build.Builder, obj: *std.build.LibExeObjStep, tar }); for (dirs_to_search.slice()) |deps_path| { - var deps_dir = std.fs.cwd().openDir(deps_path, .{ .iterate = true }) catch @panic("Failed to open dependencies directory"); + var deps_dir = std.fs.cwd().openDir(deps_path, .{ .iterate = true }) catch continue; var iterator = deps_dir.iterate(); obj.addIncludeDir(deps_path); obj.addLibPath(deps_path);