From 897471c8527ea14f693da2a95e5e9df4e54207be Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Mon, 1 Nov 2021 14:22:20 +0100 Subject: [PATCH] Meta: Don't check for toolchain if serenity.sh target is lagom This is just silly :^) $ serenity run lagom js WARNING: unknown toolchain 'js'. Defaulting to GNU. Valid values are 'Clang', 'GNU' (default) --- Meta/serenity.sh | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/Meta/serenity.sh b/Meta/serenity.sh index 84318a34ca..c4b07c2fa9 100755 --- a/Meta/serenity.sh +++ b/Meta/serenity.sh @@ -88,21 +88,26 @@ else TARGET="${SERENITY_ARCH:-"i686"}" fi -case "$1" in - GNU|Clang) - TOOLCHAIN_TYPE="$1"; shift - ;; - *) - if [ -n "$1" ]; then - echo "WARNING: unknown toolchain '$1'. Defaulting to GNU." - echo " Valid values are 'Clang', 'GNU' (default)" - fi - TOOLCHAIN_TYPE="GNU" - ;; -esac +CMAKE_ARGS=() + +# Toolchain selection only applies to non-lagom targets. +if [ "$TARGET" != "lagom" ]; then + case "$1" in + GNU|Clang) + TOOLCHAIN_TYPE="$1"; shift + ;; + *) + if [ -n "$1" ]; then + echo "WARNING: unknown toolchain '$1'. Defaulting to GNU." + echo " Valid values are 'Clang', 'GNU' (default)" + fi + TOOLCHAIN_TYPE="GNU" + ;; + esac + CMAKE_ARGS+=( "-DSERENITY_TOOLCHAIN=$TOOLCHAIN_TYPE" ) +fi CMD_ARGS=( "$@" ) -CMAKE_ARGS=( "-DSERENITY_TOOLCHAIN=$TOOLCHAIN_TYPE" ) get_top_dir() { git rev-parse --show-toplevel