From 002f202604623677e7499179bf7222d6c26881b4 Mon Sep 17 00:00:00 2001 From: Danny Robson Date: Mon, 19 Apr 2021 14:53:36 +1000 Subject: [PATCH] Update for clang-12 --- conan/profile/x86_64-clang-linux-release | 6 +++--- init.py | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/conan/profile/x86_64-clang-linux-release b/conan/profile/x86_64-clang-linux-release index 7e1ae70..ec2362b 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=11 +compiler.version=12 compiler.libcxx=libc++ build_type=Release @@ -13,5 +13,5 @@ build_type=Release [build_requires] [env] -CC=clang-11 -CXX=clang++-11 +CC=clang-12 +CXX=clang++-12 diff --git a/init.py b/init.py index 8022023..259fa9a 100755 --- a/init.py +++ b/init.py @@ -8,8 +8,6 @@ from dataclasses import dataclass, field from typing import Dict, List, Optional -CLANG_VERSION = 11 - @dataclass class Option: @@ -58,8 +56,8 @@ OPTIONS['gcc'] = Option( OPTIONS['clang'] = Option( vars={ - 'CMAKE_CXX_COMPILER': f'clang++-{CLANG_VERSION}', - 'CMAKE_C_COMPILER': f'clang-{CLANG_VERSION}', + 'CMAKE_CXX_COMPILER': f'clang++', + 'CMAKE_C_COMPILER': f'clang', #'CMAKE_CXX_FLAGS': '-fuse-ld=lld', }, compiler='clang',