From f39a819c5e14bf3df418c65e3b6567bd87ecdffa Mon Sep 17 00:00:00 2001 From: Paul Ferrand Date: Fri, 29 Nov 2019 22:45:41 +0100 Subject: [PATCH] Updated the build scripts --- scripts/asan_clang.sh | 2 +- scripts/debug_clang.sh | 2 +- scripts/debug_gcc.sh | 2 +- scripts/msan_clang.sh | 2 +- scripts/reldeb_gcc.sh | 2 +- scripts/release_clang.sh | 2 +- scripts/release_gcc.sh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/asan_clang.sh b/scripts/asan_clang.sh index 65cea03f..8c905a4f 100755 --- a/scripts/asan_clang.sh +++ b/scripts/asan_clang.sh @@ -1,3 +1,3 @@ #!/bin/sh script_dir="$(dirname "$0")" -cmake -D CMAKE_C_COMPILER=clang-10 -D CMAKE_CXX_COMPILER=clang++-10 -D CMAKE_CXX_FLAGS="-fsanitize=address" -D CMAKE_BUILD_TYPE=Release -D SFIZZ_TESTS=ON -D SFIZZ_BENCHMARKS=ON -D SFIZZ_CLIENTS=ON -S "$script_dir/.." -B . \ No newline at end of file +cmake -D CMAKE_C_COMPILER=clang -D CMAKE_CXX_COMPILER=clang++ -D CMAKE_CXX_FLAGS="-fsanitize=address" -D CMAKE_BUILD_TYPE=Release -D SFIZZ_TESTS=ON -D SFIZZ_BENCHMARKS=ON -S "$script_dir/.." -B . \ No newline at end of file diff --git a/scripts/debug_clang.sh b/scripts/debug_clang.sh index e4623c56..50bb3600 100755 --- a/scripts/debug_clang.sh +++ b/scripts/debug_clang.sh @@ -1,3 +1,3 @@ #!/bin/sh script_dir="$(dirname "$0")" -cmake -D CMAKE_C_COMPILER=clang-10 -D CMAKE_CXX_COMPILER=clang++-10 -D CMAKE_BUILD_TYPE=Debug -D SFIZZ_TESTS=ON -D SFIZZ_BENCHMARKS=ON -D SFIZZ_CLIENTS=ON -S "$script_dir/.." -B . \ No newline at end of file +cmake -D CMAKE_C_COMPILER=clang -D CMAKE_CXX_COMPILER=clang++ -D CMAKE_BUILD_TYPE=Debug -D SFIZZ_TESTS=ON -D SFIZZ_BENCHMARKS=ON -S "$script_dir/.." -B . \ No newline at end of file diff --git a/scripts/debug_gcc.sh b/scripts/debug_gcc.sh index 17a9685a..57ccb016 100755 --- a/scripts/debug_gcc.sh +++ b/scripts/debug_gcc.sh @@ -1,3 +1,3 @@ #!/bin/sh script_dir="$(dirname "$0")" -cmake -D CMAKE_C_COMPILER=gcc -D CMAKE_CXX_COMPILER=g++ -D CMAKE_BUILD_TYPE=Debug -D SFIZZ_TESTS=ON -D SFIZZ_BENCHMARKS=ON -D SFIZZ_CLIENTS=ON -S "$script_dir/.." -B . \ No newline at end of file +cmake -D CMAKE_C_COMPILER=gcc -D CMAKE_CXX_COMPILER=g++ -D CMAKE_BUILD_TYPE=Debug -D SFIZZ_TESTS=ON -D SFIZZ_BENCHMARKS=ON -S "$script_dir/.." -B . \ No newline at end of file diff --git a/scripts/msan_clang.sh b/scripts/msan_clang.sh index 97cd5b81..4dbe07f7 100755 --- a/scripts/msan_clang.sh +++ b/scripts/msan_clang.sh @@ -1,4 +1,4 @@ #!/bin/sh script_dir="$(dirname "$0")" echo "DON'T USE: libc++ is not instrumented with msan..." -cmake -D CMAKE_C_COMPILER=clang-9 -D CMAKE_CXX_COMPILER=clang++-9 -D CMAKE_CXX_FLAGS="-fsanitize=memory -fsanitize=undefined -fsanitize-memory-track-origins" -D CMAKE_BUILD_TYPE=Release -S "$script_dir/.." -B . \ No newline at end of file +cmake -D CMAKE_C_COMPILER=clang -D CMAKE_CXX_COMPILER=clang++ -D CMAKE_CXX_FLAGS="-fsanitize=memory -fsanitize=undefined -fsanitize-memory-track-origins" -D CMAKE_BUILD_TYPE=Release -S "$script_dir/.." -B . \ No newline at end of file diff --git a/scripts/reldeb_gcc.sh b/scripts/reldeb_gcc.sh index 69249a67..6f2ef540 100755 --- a/scripts/reldeb_gcc.sh +++ b/scripts/reldeb_gcc.sh @@ -1,3 +1,3 @@ #!/bin/sh script_dir="$(dirname "$0")" -cmake -D CMAKE_C_COMPILER=gcc -D CMAKE_CXX_COMPILER=g++ -D CMAKE_BUILD_TYPE=RelWithDebInfo -D SFIZZ_TESTS=ON -D SFIZZ_BENCHMARKS=ON -D SFIZZ_CLIENTS=ON -S "$script_dir/.." -B . \ No newline at end of file +cmake -D CMAKE_C_COMPILER=gcc -D CMAKE_CXX_COMPILER=g++ -D CMAKE_BUILD_TYPE=RelWithDebInfo -D SFIZZ_TESTS=ON -D SFIZZ_BENCHMARKS=ON -S "$script_dir/.." -B . \ No newline at end of file diff --git a/scripts/release_clang.sh b/scripts/release_clang.sh index b5c7f1d8..e6a1fc10 100755 --- a/scripts/release_clang.sh +++ b/scripts/release_clang.sh @@ -1,3 +1,3 @@ #!/bin/sh script_dir="$(dirname "$0")" -cmake -D CMAKE_C_COMPILER=clang-10 -D CMAKE_CXX_COMPILER=clang++-10 -D CMAKE_BUILD_TYPE=Release -D SFIZZ_TESTS=ON -D SFIZZ_BENCHMARKS=ON -D SFIZZ_CLIENTS=ON -S "$script_dir/.." -B . \ No newline at end of file +cmake -D CMAKE_C_COMPILER=clang -D CMAKE_CXX_COMPILER=clang++ -D CMAKE_BUILD_TYPE=Release -D SFIZZ_TESTS=ON -D SFIZZ_BENCHMARKS=ON -S "$script_dir/.." -B . \ No newline at end of file diff --git a/scripts/release_gcc.sh b/scripts/release_gcc.sh index 264da08f..d8d01b78 100755 --- a/scripts/release_gcc.sh +++ b/scripts/release_gcc.sh @@ -1,3 +1,3 @@ #!/bin/sh script_dir="$(dirname "$0")" -cmake -D CMAKE_C_COMPILER=gcc -D CMAKE_CXX_COMPILER=g++ -D CMAKE_BUILD_TYPE=Release -D SFIZZ_TESTS=ON -D SFIZZ_BENCHMARKS=ON -D SFIZZ_CLIENTS=ON -S "$script_dir/.." -B . +cmake -D CMAKE_C_COMPILER=gcc -D CMAKE_CXX_COMPILER=g++ -D CMAKE_BUILD_TYPE=Release -D SFIZZ_TESTS=ON -D SFIZZ_BENCHMARKS=ON -S "$script_dir/.." -B .