Skip to content

Commit 29762bb

Browse files
committed
Update ioquake and restore LLVM builds, now that RAM is fixed.
1 parent 5f3d88d commit 29762bb

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ARG IOQ3DED_VERSION \
99
TARGETVARIANT
1010

1111
# Install necessary build prerequisites
12-
RUN export IOQ3BUILD_COMPILER=$([ "${TARGETARCH}" != 'riscv64' ] && printf '%s' 'clang18 llvm18' || printf '%s' 'gcc binutils') \
12+
RUN export IOQ3BUILD_COMPILER='clang18 llvm18' \
1313
&& apk add --no-cache \
1414
${IOQ3BUILD_COMPILER} \
1515
lld \
@@ -26,10 +26,10 @@ WORKDIR /quake/extern/ioq3
2626
COPY ./ /quake/
2727

2828
# Build the server
29-
RUN export IOQ3BUILD_BIN_CC=$([ "${TARGETARCH}" != 'riscv64' ] && printf '%s' 'clang-18' || printf '%s' 'gcc') \
29+
RUN export IOQ3BUILD_BIN_CC='clang-18' \
3030
&& export IOQ3BUILD_BIN_LD=$([ "${TARGETARCH}" != 'riscv64' -a "${TARGETARCH}" != 's390x' ] && printf '%s' 'lld' || printf '%s' 'ld') \
31-
&& export IOQ3BUILD_BIN_STRIP=$([ "${TARGETARCH}" != 'riscv64' ] && printf '%s' 'llvm18-strip' || printf '%s' 'strip') \
32-
&& export IOQ3BUILD_ARG_FUSE_LD=$([ "${TARGETARCH}" != 'riscv64' ] && printf '-fuse-ld=%s' "${IOQ3BUILD_BIN_LD}" || printf '')\
31+
&& export IOQ3BUILD_BIN_STRIP='llvm18-strip' \
32+
&& export IOQ3BUILD_ARG_FUSE_LD=$(printf '-fuse-ld=%s' "${IOQ3BUILD_BIN_LD}")\
3333
&& make \
3434
-j$(nproc --all) \
3535
CC="${IOQ3BUILD_BIN_CC} -static ${IOQ3BUILD_ARG_FUSE_LD}" \

extern/ioq3

0 commit comments

Comments
 (0)