diff options
| author |  Jarred Sumner <jarred@jarredsumner.com>
| 2021-12-24 03:53:16 -0800 |
|---|---|---|
| committer | Jarred Sumner <jarred@jarredsumner.com>
| 2021-12-24 03:53:16 -0800 |
| commit | 6ae433249dc5439411a5f6b21849e8e1e9a95f5a (patch) | |
| tree | fb9bc50b2334f32112283f05bbf095f8eb360a6d | |
| parent | 5f5b824ade614e023a2f9028f3aec8c8927d5600 (diff) | |
| download | bun-6ae433249dc5439411a5f6b21849e8e1e9a95f5a.tar.gz bun-6ae433249dc5439411a5f6b21849e8e1e9a95f5a.tar.zst bun-6ae433249dc5439411a5f6b21849e8e1e9a95f5a.zip | |
musl
Diffstat (limited to '')
| -rw-r--r-- | .dockerignore | 3 | ||||
| -rw-r--r-- | push-docker.sh | 2 | ||||
| m--------- | src/javascript/jsc/WebKit | 0 | ||||
| -rw-r--r-- | zig-build/Dockerfile.musl | 26 |
4 files changed, 29 insertions, 2 deletions
diff --git a/.dockerignore b/.dockerignore index 522c5f2ee..22bc44d45 100644 --- a/.dockerignore +++ b/.dockerignore @@ -13,4 +13,5 @@ examples src/javascript/jsc/WebKit **/CMakeCache.txt packages/**/bun -packages/**/bun-profile
\ No newline at end of file +packages/**/bun-profile +zig-cache diff --git a/push-docker.sh b/push-docker.sh index 16d9640fd..3053253fe 100644 --- a/push-docker.sh +++ b/push-docker.sh @@ -4,7 +4,7 @@ source "dockerfile-common.sh" export CONTAINER_NAME=$CONTAINER_NAME -docker build . --target build_release --progress=plain -t $CONTAINER_NAME:latest --build-arg BUILDKIT_INLINE_CACHE=1 --platform=linux/$BUILDKIT_ARCH --cache-from $CONTAINER_NAME:latest +docker build . --target release --progress=plain -t $CONTAINER_NAME:latest --build-arg BUILDKIT_INLINE_CACHE=1 --platform=linux/$BUILDKIT_ARCH --cache-from $CONTAINER_NAME:latest if (($?)); then echo "Failed to build container" diff --git a/src/javascript/jsc/WebKit b/src/javascript/jsc/WebKit -Subproject a313cfa2bdc48a3a12f3ee4b53baa2258bc38e7 +Subproject 3ee75c46e7ae6ee41de783e5cc3d278e65deeee diff --git a/zig-build/Dockerfile.musl b/zig-build/Dockerfile.musl new file mode 100644 index 000000000..e46e2d2d4 --- /dev/null +++ b/zig-build/Dockerfile.musl @@ -0,0 +1,26 @@ +FROM alpine:3.15 as base + +RUN apk update +RUN apk add --no-cache cmake make clang clang-static clang-dev llvm12-dev llvm12-static musl-dev git lld libgcc gcc g++ libstdc++ build-base lld-dev lld-static llvm12-libs libc-dev xz zlib zlib-dev libxml2 libxml2-dev + +ENV CXX=clang++ +ENV CC=clang +ENV LDFLAGS='-L/usr/include -L/usr/include/llvm12' +ENV CXXFLAGS="-I/usr/include -I/usr/include/llvm12" +ENV PATH="/usr/bin:/usr/local/bin:/zig/bin:$PATH" + +FROM base as zig + +# Compile zig +RUN --mount=type=tmpfs,target=/zig-build mkdir /zig; \ + cd /zig-build && \ + mkdir -p /zig-build; \ + git clone -b jarred/zig-sloppy-with-small-structs --single-branch --depth=1 https://github.com/jarred-sumner/zig.git .; \ + cd /zig-build; \ + cmake . -DZIG_STATIC_LLVM=ON -DLLVM_INCLUDE_DIRS=$LLVM_INCLUDE_DIRS -DCMAKE_BUILD_TYPE=Release && \ + make -j$(nproc) && make install && \ + rm -rf .git && \ + cd /zig-build && \ + cp -r /zig-build/bin /zig/bin && \ + cp -r /zig-build/lib /zig/lib + |