From 3178241d9a3e91dd2c519e5b419523bb071564ca Mon Sep 17 00:00:00 2001 From: dzaima Date: Thu, 23 Mar 2023 18:08:28 +0200 Subject: [PATCH] update Singeli, move "make forbuild" to "make for-build" --- build/build | 8 ++++---- build/singeliSubmodule | 2 +- makefile | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/build b/build/build index 997d6ec9..3f5b4cc6 100755 --- a/build/build +++ b/build/build @@ -1,17 +1,17 @@ #!/usr/bin/env bash DIR="$(dirname $0)" -PREV_BQN="$DIR/obj2/for_build" +PREV_BQN="$DIR/obj2/for_build2" if [ ! -f "$PREV_BQN" ]; then TMP_BQN="$DIR/obj2/for_build_tmp" - if make -C "$DIR/.." forbuild OUTPUT="$TMP_BQN"; then + if make -C "$DIR/.." for-build OUTPUT="$TMP_BQN"; then if [ "4" = "$("$TMP_BQN" -p "2+2")" ]; then true else - echo "bootstrap CBQN failed to return expected result; run 'make forbuild' with necessary configuration manually" + echo "automatically-built bootstrap CBQN doesn't behave as expected; run 'make for-build' with necessary configuration manually" exit 1 fi else - echo "failed to build bootstrap CBQN; run 'make forbuild' with necessary configuration manually" + echo "failed to build bootstrap CBQN; run 'make for-build' with necessary configuration manually" exit 1 fi diff --git a/build/singeliSubmodule b/build/singeliSubmodule index 2b4e3b8c..a17f83b2 160000 --- a/build/singeliSubmodule +++ b/build/singeliSubmodule @@ -1 +1 @@ -Subproject commit 2b4e3b8cdf6f3a5f8ddf383a8421f012550b8c27 +Subproject commit a17f83b2db2c1e025a56af0401682c45eb883257 diff --git a/makefile b/makefile index c00dfcb5..36fc3b1b 100644 --- a/makefile +++ b/makefile @@ -37,8 +37,8 @@ shared-o3: @"${MAKE}" i_OUTPUT=libcbqn.so i_SHARED=1 i_t=shared_o3 i_f="-O3" run_incremental_0 shared-c: @"${MAKE}" i_OUTPUT=libcbqn.so i_SHARED=1 custom=1 run_incremental_0 -forbuild: - @"${MAKE}" i_singeli=0 i_CC=cc i_t=forbuild i_f="-O2 -DFOR_BUILD" i_FFI=0 i_OUTPUT=build/obj2/for_build run_incremental_0 +for-build: + @"${MAKE}" i_singeli=0 i_CC=cc i_t=forbuild i_f="-O2 -DFOR_BUILD" i_FFI=0 i_OUTPUT=build/obj2/for_build2 run_incremental_0 for-bootstrap: @"${MAKE}" i_t=for_bootstrap i_f='-DNATIVE_COMPILER -DONLY_NATIVE_COMP -DFORMATTER=0 -DNO_RT -DNO_EXPLAIN' run_incremental_0 i_USE_BC_SUBMODULE=0 BYTECODE_DIR=bytecodeNone c: