conan: initial conan2 updates

This commit is contained in:
Danny Robson 2024-05-21 12:45:43 +10:00
parent 5fe431b8da
commit 4774b12447
8 changed files with 90 additions and 52 deletions

View File

@ -2,18 +2,25 @@
os=Linux os=Linux
arch=x86_64 arch=x86_64
compiler=clang compiler=aflplusplus-clang
compiler.version=13.2 compiler.version=17
compiler.libcxx=libc++ compiler.libcxx=libc++
build_type=Release build_type=Release
[options] [options]
[build_requires] [buildenv]
CC=afl-clang-flast
CXX=afl-clang-fast++
CFLAGS=-flto -Wno-error
CXXFLAGS=-flto -Wno-error
[env] AFL_USE_UBSAN=1
CC=afl-clang AFL_USE_LSAN=1
CXX=afl-clang++ AFL_USE_ASAN=1
CFLAGS="-flto"
CXXFLAGS="-flto" [conf]
tools.build:compiler_executables={"c": "afl-clang-fast", "cpp": "afl-clang-fast++"}
tools.build:cxxflags=["-fsanitize=undefined", "-fsanitize=address", "-fsanitize=leak", "-Wno-error"]
tools.build:cflags=["-fsanitize=undefined", "-fsanitize=address", "-fsanitize=leak", "-Wno-error"]

View File

@ -0,0 +1,26 @@
[settings]
os=Linux
arch=x86_64
compiler=aflplusplus-gcc
compiler.version=14
compiler.libcxx=libstdc++11
build_type=Release
[options]
[buildenv]
CC=afl-gcc-flast
CXX=afl-gcc-fast++
CFLAGS=-flto -Wno-error
CXXFLAGS=-flto -Wno-error
AFL_USE_UBSAN=1
AFL_USE_LSAN=1
AFL_USE_ASAN=1
[conf]
tools.build:compiler_executables={"c": "afl-gcc-fast", "cpp": "afl-gcc-fast++"}
tools.build:cxxflags=["-fsanitize=undefined", "-fsanitize=address", "-fsanitize=leak", "-Wno-error"]
tools.build:cflags=["-fsanitize=undefined", "-fsanitize=address", "-fsanitize=leak", "-Wno-error"]

View File

@ -10,9 +10,7 @@ build_type=Debug
[options] [options]
[build_requires] [buildenv]
[env]
CC=clang-18 CC=clang-18
CXX=clang++-18 CXX=clang++-18

View File

@ -11,13 +11,11 @@ build_type=Release
[options] [options]
[build_requires] [buildenv]
[env]
CC=clang-18 CC=clang-18
CXX=clang++-18 CXX=clang++-18
CFLAGS=-flto CFLAGS=-flto
CXXFLAGS=-flto CXXFLAGS=-flto -stdlib=libc++
[conf] [conf]
tools.build:cxxflags=["-flto", "-stdlib=libc++"] tools.build:cxxflags=["-flto", "-stdlib=libc++"]

View File

@ -10,9 +10,11 @@ build_type=Release
[options] [options]
[build_requires] [buildenv]
[env]
CC=clang-18 CC=clang-18
CXX=clang++-18 CXX=clang++-18
CXXFLAGS="-fsanitize=undefined -fsanitize=address -fsanitize=leak" CXXFLAGS="-fsanitize=undefined -fsanitize=address -fsanitize=leak"
[conf]
tools.build:cxxflags=["-fsanitize=undefined", "-fsanitize=address", "-fsanitize=leak"]
tools.build:compiler_executables={"c": "clang-18","cpp": "clang++-18"}

View File

@ -1,14 +1,14 @@
VERSION=14 {% set VERSION = 14 %}
CC=gcc-$VERSION {% set CC = "gcc-$VERSION" %}
CXX=g++-$VERSION {% set CXX = "g++-$VERSION" %}
CXXFLAGS=-D_GLIBCXX_DEBUG {% set CXXFLAGS = "-D_GLIBCXX_DEBUG" %}
[settings] [settings]
os=Linux os=Linux
arch=x86_64 arch=x86_64
compiler=gcc compiler=gcc
compiler.version=$VERSION compiler.version={{ VERSION }}
compiler.libcxx=libstdc++11 compiler.libcxx=libstdc++11
build_type=Debug build_type=Debug
@ -18,7 +18,7 @@ build_type=Debug
[buildenv] [buildenv]
CC=$CC CC=$CC
CXX=$CXX CXX=$CXX
CXXFLAGS=-D_GLIBCXX_DEBUG CXXFLAGS={{ CXXFLAGS }}
[conf] [conf]
tools.build:compiler_executables={"c": "gcc-14","cpp": "g++-14"} tools.build:compiler_executables={"c": "gcc-14","cpp": "g++-14"}

View File

@ -0,0 +1,20 @@
[settings]
os=Linux
arch=x86_64
compiler=gcc
compiler.version=14
compiler.libcxx=libstdc++11
build_type=Release
[options]
[buildenv]
CC=gcc-14
CXX=g++-14
CXXFLAGS=-flto -ffat-lto-objects
[conf]
tools.build:cxxflags=["-flto", "-ffat-lto-objects", "-fsanitize=undefined", "-fsanitize=address", "-fsanitize=leak"]
tools.build:compiler_executables={"c": "gcc-14","cpp": "g++-14"}

View File

@ -1,31 +1,19 @@
toolchain=/usr/x86_64-w64-mingw32 {% set toolchain = "/usr/x86_64-w64-mingw32" %}
target_host=x86_64-w64-mingw32 {% set target_host = "x86_64-w64-mingw32" %}
cc_compiler=gcc {% set cc_compiler = "gcc" %}
cxx_compiler=g++ {% set cxx_compiler = "g++" %}
[env]
CONAN_CMAKE_FIND_ROOT_PATH=$toolchain
CONAN_CMAKE_SYSROOT=$toolchain
CHOST=$target_host
AR=$target_host-ar
AS=$target_host-as
RANLIB=$target_host-ranlib
CC=$target_host-$cc_compiler
CXX=$target_host-$cxx_compiler
STRIP=$target_host-strip
RC=$target_host-windres
[buildenv] [buildenv]
CONAN_CMAKE_FIND_ROOT_PATH=$toolchain CONAN_CMAKE_FIND_ROOT_PATH={{toolchain}}
CONAN_CMAKE_SYSROOT=$toolchain CONAN_CMAKE_SYSROOT={{toolchain}}
CHOST=$target_host CHOST={{target_host}}
AR=$target_host-ar AR={{target_host}}-ar
AS=$target_host-as AS={{target_host}}-as
RANLIB=$target_host-ranlib RANLIB={{target_host}}-ranlib
CC=$target_host-$cc_compiler CC={{target_host}}-{{cc_compiler}}
CXX=$target_host-$cxx_compiler CXX={{target_host}}-{{cxx_compiler}}
STRIP=$target_host-strip STRIP={{target_host}}-strip
RC=$target_host-windres RC={{target_host}}-windres
[settings] [settings]
os=Windows os=Windows
@ -37,5 +25,4 @@ compiler.libcxx=libstdc++11
build_type=Release build_type=Release
[conf] [conf]
tools.env.virtualenv:auto_use=True tools.build:compiler_executables={"c": "{{target_host}}-{{cc_compiler}}","cpp": "{{target_host}}-{{cxx_compiler}}","rc":"{{target_host}}-windres"}
tools.build:compiler_executables={"c": "$target_host-$cc_compiler","cpp": "$target_host-$cxx_compiler","rc":"$target_host-windres"}