Take 3

DragonBuild · Jul 28, 2024 · 2f66ebb · 2f66ebb
1 parent 902b94f
commit 2f66ebb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/bin/dragon b/bin/dragon
@@ -214,7 +214,7 @@ if [[ $build -eq 1 ]]; then
             mkdir -p "$i/$DRAGON_DIR/"
             cp DragonMake "$i/$DRAGON_DIR/DragonMake" 2> /dev/null
         fi
-        build $i $j
+        build $i $j || drexit 1
     done
 
     find . -name '.clean' -type f -delete

diff --git a/src/dragon/shscripts/building b/src/dragon/shscripts/building
@@ -60,8 +60,8 @@ build()
     fi
 
     projroot="$(dirname "$DRAGON_DATA_DIR")"
-    env $'NINJA_STATUS=\x1b[1;34m[Dragon] \x1b[35m[%f/%t] \x1b[34m(%e)\x1b[0m ' CLICOLOR_FORCE=1 ninja -j$JOBS $NINJA_ARGS || cleanbuildfail $projroot; drexit 1
-    env $'NINJA_STATUS=\x1b[1;34m[Dragon] \x1b[34m>>>\x1b[0m ' CLICOLOR_FORCE=1 ninja -j$JOBS stage $NINJA_ARGS || cleanbuildfail $projroot; drexit 1
+    env $'NINJA_STATUS=\x1b[1;34m[Dragon] \x1b[35m[%f/%t] \x1b[34m(%e)\x1b[0m ' CLICOLOR_FORCE=1 ninja -j$JOBS $NINJA_ARGS || cleanbuildfail $projroot
+    env $'NINJA_STATUS=\x1b[1;34m[Dragon] \x1b[34m>>>\x1b[0m ' CLICOLOR_FORCE=1 ninja -j$JOBS stage $NINJA_ARGS || cleanbuildfail $projroot
 
     if [[ $exportt -eq 1 ]]; then
         prefix_print "Generating compile_commands.json"