Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added more recent versions of clang and speedup startup time #12

Merged
merged 3 commits into from
Oct 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ LABEL maintainer="Michele Adduci <[email protected]>" \
EXPOSE 10240

RUN echo "*** Installing Compiler Explorer ***" \
&& wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
&& add-apt-repository -y "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main" \
&& add-apt-repository -y "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main" \
&& add-apt-repository -y "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-19 main" \
&& DEBIAN_FRONTEND=noninteractive apt-get update \
&& apt-get install -y curl \
&& curl -sL https://deb.nodesource.com/setup_18.x | bash - \
Expand All @@ -15,19 +19,26 @@ RUN echo "*** Installing Compiler Explorer ***" \
nodejs \
make \
git \
g++-9 \
g++-10 \
g++-11 \
clang-16 \
clang-17 \
clang-18 \
clang-19 \
&& apt-get autoremove --purge -y \
&& apt-get autoclean -y \
&& rm -rf /var/cache/apt/* /tmp/* \
&& git clone https://github.com/compiler-explorer/compiler-explorer.git /compiler-explorer \
&& cd /compiler-explorer \
&& echo "Add missing dependencies" \
&& npm i @sentry/node \
&& npm run webpack
&& make prebuild

ADD cpp.properties /compiler-explorer/etc/config/c++.local.properties

WORKDIR /compiler-explorer

ENTRYPOINT [ "make" ]

CMD ["run"]
CMD ["run-only"]
28 changes: 24 additions & 4 deletions cpp.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ compiler.g11.name=g++ 11
compiler.gdefault.exe=/usr/bin/g++-11
compiler.gdefault.name=g++ default (11)

group.clang.compilers=clang13:clang14:clang15:clangdefault
group.clang.compilers=clang13:clang13x86:clang14:clang14x86:clang15:clang15x86:clang16:clang16x86:clang17:clang17x86:clang18:clang18x86:clang19:clang19x86:clangdefault
group.clang.intelAsm=-mllvm --x86-asm-syntax=intel
group.clang.compilerType=clang
compiler.clang13.exe=/usr/bin/clang++-13
Expand All @@ -29,8 +29,28 @@ compiler.clang15.name=clang 15
compiler.clang15x86.exe=/usr/bin/clang++-15
compiler.clang15x86.name=clang 15 x86
compiler.clang15x86.options=-std=c++1z -Wall -Wextra -Wshadow -O3 -m32 -march=i386
compiler.clangdefault.exe=/usr/bin/clang++-15
compiler.clangdefault.name=clang default (15)
compiler.clang16.exe=/usr/bin/clang++-16
compiler.clang16.name=clang 16
compiler.clang16x86.exe=/usr/bin/clang++-16
compiler.clang16x86.name=clang 16 x86
compiler.clang16x86.options=-std=c++1z -Wall -Wextra -Wshadow -O3 -m32 -march=i386
compiler.clang17.exe=/usr/bin/clang++-17
compiler.clang17.name=clang 17
compiler.clang17x86.exe=/usr/bin/clang++-17
compiler.clang17x86.name=clang 17 x86
compiler.clang17x86.options=-std=c++1z -Wall -Wextra -Wshadow -O3 -m32 -march=i386
compiler.clang18.exe=/usr/bin/clang++-18
compiler.clang18.name=clang 18
compiler.clang18x86.exe=/usr/bin/clang++-18
compiler.clang18x86.name=clang 18 x86
compiler.clang18x86.options=-std=c++1z -Wall -Wextra -Wshadow -O3 -m32 -march=i386
compiler.clang19.exe=/usr/bin/clang++-19
compiler.clang19.name=clang 19
compiler.clang19x86.exe=/usr/bin/clang++-19
compiler.clang19x86.name=clang 19 x86
compiler.clang19x86.options=-std=c++1z -Wall -Wextra -Wshadow -O3 -m32 -march=i386
compiler.clangdefault.exe=/usr/bin/clang++-19
compiler.clangdefault.name=clang default (19)

defaultCompiler=gdefault
postProcess=
Expand All @@ -48,4 +68,4 @@ supportsLibraryCodeFilter=true
#################################
#################################
# Installed libs (See c++.amazon.properties for a scheme of libs group)
libs=
libs=
2 changes: 0 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3"

services:
compiler-explorer:
build:
Expand Down
Loading