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

Meta: Make serenity.sh invoke cmake when build.ninja is missing

Browse source
This commit is contained in:
Jelle Raaijmakers 2021-06-01 12:25:34 +02:00 • committed by Linus Groh
parent 996f69a1b2
commit 468bb54677
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Meta/serenity.sh
View file

@ -118,7 +118,7 @@ cmd_with_target() {
} }
ensure_target() { ensure_target() {
[ -d "$BUILD_DIR" ] || create_build_dir [ -f "$BUILD_DIR/build.ninja" ] || create_build_dir
} }
run_tests() { run_tests() {
@ -209,9 +209,7 @@ run_gdb() {
if [[ "$CMD" =~ ^(build|install|image|run|gdb|test|rebuild|recreate|kaddr2line|addr2line|setup-and-run)$ ]]; then if [[ "$CMD" =~ ^(build|install|image|run|gdb|test|rebuild|recreate|kaddr2line|addr2line|setup-and-run)$ ]]; then
cmd_with_target cmd_with_target
[[ "$CMD" != "recreate" && "$CMD" != "rebuild" ]] || delete_target [[ "$CMD" != "recreate" && "$CMD" != "rebuild" ]] || delete_target
# FIXME: We should probably call ensure_toolchain first, but this somehow causes ensure_toolchain
# this error after the toolchain finished building:
# ninja: error: loading 'build.ninja': No such file or directory
ensure_target ensure_target
[ "$TARGET" = "lagom" ] || ensure_toolchain [ "$TARGET" = "lagom" ] || ensure_toolchain
case "$CMD" in case "$CMD" in