summaryrefslogtreecommitdiff
path: root/src/build
diff options
context:
space:
mode:
authorMitchell Hashimoto <m@mitchellh.com>2025-10-02 15:57:09 -0700
committerMitchell Hashimoto <m@mitchellh.com>2025-10-03 07:10:43 -0700
commit87b77e19803f1fccd4eaa7136ee2f0104369cfa2 (patch)
tree9040d0b64146ee8604d2245319198c206fcbbd43 /src/build
parent4e3e0ed0563f359d8dcba3984d0a094f38049fe0 (diff)
ci: cleanup
Diffstat (limited to 'src/build')
-rw-r--r--src/build/GhosttyLib.zig3
-rw-r--r--src/build/docker/debian/Dockerfile4
2 files changed, 5 insertions, 2 deletions
diff --git a/src/build/GhosttyLib.zig b/src/build/GhosttyLib.zig
index d5ec66de8..2ac383544 100644
--- a/src/build/GhosttyLib.zig
+++ b/src/build/GhosttyLib.zig
@@ -82,6 +82,9 @@ pub fn initShared(
.omit_frame_pointer = deps.config.strip,
.unwind_tables = if (deps.config.strip) .none else .sync,
}),
+
+ // Fails on self-hosted x86_64
+ .use_llvm = true,
});
_ = try deps.add(lib);
diff --git a/src/build/docker/debian/Dockerfile b/src/build/docker/debian/Dockerfile
index 73c7da7c8..815d395cd 100644
--- a/src/build/docker/debian/Dockerfile
+++ b/src/build/docker/debian/Dockerfile
@@ -29,10 +29,10 @@ COPY ./build.zig /src
# Install zig
# https://ziglang.org/download/
-RUN export ZIG_VERSION=$(sed -n -e 's/^.*requireZig("\(.*\)").*$/\1/p' build.zig) && curl -L -o /tmp/zig.tar.xz "https://ziglang.org/download/$ZIG_VERSION/zig-linux-$(uname -m)-$ZIG_VERSION.tar.xz" && \
+RUN export ZIG_VERSION=$(sed -n -e 's/^.*requireZig("\(.*\)").*$/\1/p' build.zig) && curl -L -o /tmp/zig.tar.xz "https://ziglang.org/download/$ZIG_VERSION/zig-$(uname -m)-linux-$ZIG_VERSION.tar.xz" && \
tar -xf /tmp/zig.tar.xz -C /opt && \
rm /tmp/zig.tar.xz && \
- ln -s "/opt/zig-linux-$(uname -m)-$ZIG_VERSION/zig" /usr/local/bin/zig
+ ln -s "/opt/zig-$(uname -m)-linux-$ZIG_VERSION/zig" /usr/local/bin/zig
COPY . /src