From 0ac3d29d8d8269c4ef7e7430c64afb214a714aa1 Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Mon, 2 Jan 2023 15:58:20 -0700 Subject: [PATCH] Jakt: Ensure cxx-compiler-path matches the compiler that compiled jakt (#4514) The way that jakt calls out to a C++ compiler to compile the C++ source files it generates is sensitive to which compiler compiled its runtime library. Rather than using clang-trunk, use the same compiler that was used in misc-builder: gcc-12.1.0. This does cause a warning or two, as it seems gcc 12.1.0 doesn't implement [[unlikely]] yet, but that's better than not being able to link executables at all. This issue will likely come up again if the compiler used in misc-builder to build the jakt compiler changes. --- etc/config/jakt.amazon.properties | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/etc/config/jakt.amazon.properties b/etc/config/jakt.amazon.properties index 6653c6c7308..0ead89e1de6 100644 --- a/etc/config/jakt.amazon.properties +++ b/etc/config/jakt.amazon.properties @@ -16,5 +16,4 @@ licensePreamble=Copyright (c) 2022, JT, Andreas Kling. All rights reserved. compiler.selfhosted.exe=/opt/compiler-explorer/jakt-trunk/bin/jakt compiler.selfhosted.name=jakt (trunk) -compiler.selfhosted.options=--runtime-path /opt/compiler-explorer/jakt-trunk/runtime --prettify-cpp-source --clang-format-path /opt/compiler-explorer/clang-trunk/bin/clang-format --dot-clang-format-path /opt/compiler-explorer/jakt-trunk/.clang-format --cxx-compiler-path /opt/compiler-explorer/clang-trunk/bin/clang++ -compiler.selfhosted.alias=rustbased +compiler.selfhosted.options=--runtime-path /opt/compiler-explorer/jakt-trunk/runtime --prettify-cpp-source --clang-format-path /opt/compiler-explorer/clang-trunk/bin/clang-format --dot-clang-format-path /opt/compiler-explorer/jakt-trunk/.clang-format --cxx-compiler-path /opt/compiler-explorer/gcc-12.1.0/bin/g++