diff options
| author | Jelle Raaijmakers <jelle@gmta.nl> | 2022-05-16 10:15:43 +0200 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2022-05-17 00:53:26 +0200 |
| commit | b7ffb2bde74900613c8e6c68e033c6ce8cf38364 (patch) | |
| tree | 7cde2b11d9c0d99319b6d8a124d93ca0f157bd55 | |
| parent | 2b764b3594634f1f0b4ee5daefcb91c117bf64a5 (diff) | |
| download | serenity-b7ffb2bde74900613c8e6c68e033c6ce8cf38364.zip | |
Meta: Validate explicitly set TOOLCHAIN in `serenity.sh`
Previously, `serenity.sh rebuild-toolchain x86_64 clang` would simply
start building GCC instead and call it a day. With this change, if a
toolchain is passed as an argument, it is validated if it is either
"GNU" or "Clang" and exits with an error otherwise.
The `TOOLCHAIN` value defaults to the `SERENITY_TOOLCHAIN` environment
variable if not provided explicitly.
| -rwxr-xr-x | Meta/serenity.sh | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/Meta/serenity.sh b/Meta/serenity.sh index c3fe97e30b..cf2858e785 100755 --- a/Meta/serenity.sh +++ b/Meta/serenity.sh @@ -8,7 +8,7 @@ print_help() { cat <<EOF Usage: $NAME COMMAND [TARGET] [TOOLCHAIN] [ARGS...] Supported TARGETs: aarch64, i686, x86_64, lagom. Defaults to SERENITY_ARCH, or i686 if not set. - Supported TOOLCHAINs: GNU, Clang. Defaults to GNU if not set. + Supported TOOLCHAINs: GNU, Clang. Defaults to SERENITY_TOOLCHAIN, or GNU if not set. Supported COMMANDs: build: Compiles the target binaries, [ARGS...] are passed through to ninja install: Installs the target binary @@ -92,21 +92,16 @@ CMAKE_ARGS=() HOST_COMPILER="" # 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" ) +if [ "$TARGET" != "lagom" ] && [ -n "$1" ]; then + TOOLCHAIN_TYPE="$1"; shift +else + TOOLCHAIN_TYPE="${SERENITY_TOOLCHAIN:-"GNU"}" +fi +if ! [[ "${TOOLCHAIN_TYPE}" =~ ^(GNU|Clang)$ ]]; then + >&2 echo "ERROR: unknown toolchain '${TOOLCHAIN_TYPE}'." + exit 1 fi +CMAKE_ARGS+=( "-DSERENITY_TOOLCHAIN=$TOOLCHAIN_TYPE" ) CMD_ARGS=( "$@" ) |