Skip to content

Commit

Permalink
Update ioquake and restore LLVM builds, now that RAM is fixed.
Browse files Browse the repository at this point in the history
  • Loading branch information
Emzi0767 committed Sep 25, 2024
1 parent 5f3d88d commit 29762bb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ARG IOQ3DED_VERSION \
TARGETVARIANT

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

# Build the server
RUN export IOQ3BUILD_BIN_CC=$([ "${TARGETARCH}" != 'riscv64' ] && printf '%s' 'clang-18' || printf '%s' 'gcc') \
RUN export IOQ3BUILD_BIN_CC='clang-18' \
&& export IOQ3BUILD_BIN_LD=$([ "${TARGETARCH}" != 'riscv64' -a "${TARGETARCH}" != 's390x' ] && printf '%s' 'lld' || printf '%s' 'ld') \
&& export IOQ3BUILD_BIN_STRIP=$([ "${TARGETARCH}" != 'riscv64' ] && printf '%s' 'llvm18-strip' || printf '%s' 'strip') \
&& export IOQ3BUILD_ARG_FUSE_LD=$([ "${TARGETARCH}" != 'riscv64' ] && printf '-fuse-ld=%s' "${IOQ3BUILD_BIN_LD}" || printf '')\
&& export IOQ3BUILD_BIN_STRIP='llvm18-strip' \
&& export IOQ3BUILD_ARG_FUSE_LD=$(printf '-fuse-ld=%s' "${IOQ3BUILD_BIN_LD}")\
&& make \
-j$(nproc --all) \
CC="${IOQ3BUILD_BIN_CC} -static ${IOQ3BUILD_ARG_FUSE_LD}" \
Expand Down
2 changes: 1 addition & 1 deletion extern/ioq3

0 comments on commit 29762bb

Please sign in to comment.