From 9ba76ea25a1b6d3fd437ab3beea69a33766ecb4c Mon Sep 17 00:00:00 2001 From: Luke Wilde Date: Fri, 11 Apr 2025 17:06:55 +0100 Subject: [PATCH] Meta: Use presets, chosen clang and explicit sysroot to build fuzzers This near enough matches what CI does to build fuzzers, with the differences being the explicit -GNinja and setting CMAKE_OSX_SYSROOT, as CMake 4 no longer does that for us. --- Meta/Lagom/BuildFuzzers.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Meta/Lagom/BuildFuzzers.sh b/Meta/Lagom/BuildFuzzers.sh index 1bc94de4c14..b6f9aa48d77 100755 --- a/Meta/Lagom/BuildFuzzers.sh +++ b/Meta/Lagom/BuildFuzzers.sh @@ -52,10 +52,15 @@ fi # FIXME: Replace these CMake invocations with a CMake superbuild? echo "Building Lagom Tools..." -cmake -GNinja -B Build/tools \ +pick_clang +cmake -GNinja --preset=Distribution -B Build/tools \ -DLAGOM_TOOLS_ONLY=ON \ + -DINSTALL_LAGOM_TOOLS=ON \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_INSTALL_PREFIX=Build/tool-install \ + -DCMAKE_C_COMPILER=$BEST_CLANG_CANDIDATE \ + -DCMAKE_CXX_COMPILER="${BEST_CLANG_CANDIDATE/clang/clang++}" \ + -DCMAKE_OSX_SYSROOT=macosx \ -Dpackage=LagomTools ninja -C Build/tools install @@ -87,13 +92,10 @@ elif [ "$#" -gt "0" ] && [ "--standalone" = "$1" ] ; then ninja -C Build/lagom-fuzzers-standalone else echo "Building for local fuzz configuration..." - pick_clang - cmake -GNinja -B Build/lagom-fuzzers \ - -DENABLE_FUZZERS_LIBFUZZER=ON \ - -DENABLE_ADDRESS_SANITIZER=ON \ - -DENABLE_UNDEFINED_SANITIZER=ON \ + cmake -GNinja --preset Fuzzers -B Build/lagom-fuzzers \ -DCMAKE_PREFIX_PATH=Build/tool-install \ -DCMAKE_C_COMPILER=$BEST_CLANG_CANDIDATE \ - -DCMAKE_CXX_COMPILER="${BEST_CLANG_CANDIDATE/clang/clang++}" + -DCMAKE_CXX_COMPILER="${BEST_CLANG_CANDIDATE/clang/clang++}" \ + -DCMAKE_OSX_SYSROOT=macosx ninja -C Build/lagom-fuzzers fi