From 21a4de4c669c0f5ce8b3e549cbc784c29d664833 Mon Sep 17 00:00:00 2001 From: Danny Robson Date: Sun, 24 Apr 2022 15:09:30 +1000 Subject: [PATCH] conan: bump clang to version 14 --- conan/profile/x86_64-clang-linux-debug | 6 +++--- conan/profile/x86_64-clang-linux-release | 8 +++++--- init.py | 9 ++++++++- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/conan/profile/x86_64-clang-linux-debug b/conan/profile/x86_64-clang-linux-debug index b7db747..00454f8 100644 --- a/conan/profile/x86_64-clang-linux-debug +++ b/conan/profile/x86_64-clang-linux-debug @@ -3,7 +3,7 @@ os=Linux arch=x86_64 compiler=clang -compiler.version=13 +compiler.version=14 compiler.libcxx=libc++ build_type=Debug @@ -13,5 +13,5 @@ build_type=Debug [build_requires] [env] -CC=clang-13 -CXX=clang++-13 +CC=clang-14 +CXX=clang++-14 diff --git a/conan/profile/x86_64-clang-linux-release b/conan/profile/x86_64-clang-linux-release index f3c2c48..c27e31b 100644 --- a/conan/profile/x86_64-clang-linux-release +++ b/conan/profile/x86_64-clang-linux-release @@ -3,7 +3,7 @@ os=Linux arch=x86_64 compiler=clang -compiler.version=13 +compiler.version=14 compiler.libcxx=libc++ build_type=Release @@ -13,5 +13,7 @@ build_type=Release [build_requires] [env] -CC=clang-13 -CXX=clang++-13 +CC=clang-14 +CXX=clang++-14 +CFLAGS="-flto" +CXXFLAGS="-flto" diff --git a/init.py b/init.py index 259fa9a..3fe8789 100755 --- a/init.py +++ b/init.py @@ -93,6 +93,7 @@ OPTIONS['sanitizer'] = Option( require=[ 'release' ], + config='sanitizer', ) @@ -226,7 +227,13 @@ if __name__ == '__main__': accumulated = [f'"-D{key}={val}"' for key, val in accum.vars.items()] + accum.args - conan_build_profile = 'x86_64-gcc-linux-release' + conan_build_profile = '-'.join([ + 'x86_64', + accum.compiler, + 'linux', + accum.config + ]) + conan_host_profile = '-'.join([ accum.arch, accum.compiler,