RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 05:37:34 +00:00
Code Issues Activity Actions

Meta: Don't check for toolchain if serenity.sh target is lagom

Browse source 
This is just silly :^)

    $ serenity run lagom js
    WARNING: unknown toolchain 'js'. Defaulting to GNU.
             Valid values are 'Clang', 'GNU' (default)
This commit is contained in:
Linus Groh 2021-11-01 14:22:20 +01:00 • committed by Andreas Kling
parent 0909bbfe38
commit 897471c852
1 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Meta/serenity.sh
View file

@ -88,7 +88,11 @@ else
TARGET="${SERENITY_ARCH:-"i686"}" TARGET="${SERENITY_ARCH:-"i686"}"
fi fi
case "$1" in CMAKE_ARGS=()
# Toolchain selection only applies to non-lagom targets.
if [ "$TARGET" != "lagom" ]; then
case "$1" in
GNU|Clang) GNU|Clang)
TOOLCHAIN_TYPE="$1"; shift TOOLCHAIN_TYPE="$1"; shift
;; ;;
@ -99,10 +103,11 @@ case "$1" in
fi fi
TOOLCHAIN_TYPE="GNU" TOOLCHAIN_TYPE="GNU"
;; ;;
esac esac
CMAKE_ARGS+=( "-DSERENITY_TOOLCHAIN=$TOOLCHAIN_TYPE" )
fi
CMD_ARGS=( "$@" ) CMD_ARGS=( "$@" )
CMAKE_ARGS=( "-DSERENITY_TOOLCHAIN=$TOOLCHAIN_TYPE" )
get_top_dir() { get_top_dir() {
git rev-parse --show-toplevel git rev-parse --show-toplevel