From 5239265a61dd2c1294f45cc68511fe1d1cb0e158 Mon Sep 17 00:00:00 2001 From: dzaima Date: Thu, 17 Nov 2022 19:45:18 +0200 Subject: [PATCH] move singeli submodule to build/ --- .gitignore | 1 + .gitmodules | 4 ++-- SingeliClone | 1 - build/singeliSubmodule | 1 + makefile | 8 ++++---- 5 files changed, 8 insertions(+), 7 deletions(-) delete mode 160000 SingeliClone create mode 160000 build/singeliSubmodule diff --git a/.gitignore b/.gitignore index ce02c8ab..4507d6f3 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ perf.* /asm_* /src/singeli/gen /Singeli +build/singeliLocal /local/ CBQNHeapDump /test/ffi/ffiTest.o diff --git a/.gitmodules b/.gitmodules index 04092118..cdb35553 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "SingeliClone"] - path = SingeliClone +[submodule "build/singeliSubmodule"] + path = build/singeliSubmodule url = https://github.com/mlochbaum/Singeli diff --git a/SingeliClone b/SingeliClone deleted file mode 160000 index 6dbe5d5a..00000000 --- a/SingeliClone +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6dbe5d5a424d7873210dd3b7e26999c2c0a33924 diff --git a/build/singeliSubmodule b/build/singeliSubmodule new file mode 160000 index 00000000..d76f2bef --- /dev/null +++ b/build/singeliSubmodule @@ -0,0 +1 @@ +Subproject commit d76f2befeca169e94feda44edc65c3785412745d diff --git a/makefile b/makefile index cc555238..3f929ef7 100644 --- a/makefile +++ b/makefile @@ -235,9 +235,9 @@ ${bd}/load.o: src/gen/customRuntime # singeli .INTERMEDIATE: preSingeliBin preSingeliBin: - @if [ ! -d Singeli ]; then \ - echo "Updating Singeli submodule; link custom Singeli to Singeli/ to avoid"; \ - git submodule update --init; \ + @if [ ! -d build/singeliLocal ]; then \ + echo "Using Singeli submodule; alternatively, link local version to build/singeliLocal"; \ + git submodule update --init build/singeliSubmodule; \ fi @echo "pre-singeli build:" @${MAKE} i_singeli=0 singeli=0 force_build_dir=obj/presingeli REPLXX=0 f= lf= postmsg="singeli sources:" i_t=presingeli i_f='-O1 -DPRE_SINGELI' FFI=0 OUTPUT=obj/presingeli/BQN c @@ -247,7 +247,7 @@ build_singeli: ${addprefix src/singeli/gen/, cmp.c dyarith.c copy.c equal.c sque @echo $(postmsg) src/singeli/gen/%.c: src/singeli/src/%.singeli preSingeliBin @echo $< | cut -c 17- | sed 's/^/ /' - @obj/presingeli/BQN SingeliMake.bqn "$$(if [ -d Singeli ]; then echo Singeli; else echo SingeliClone; fi)" $< $@ "obj/singeli/" + @obj/presingeli/BQN SingeliMake.bqn "$$(if [ -d build/singeliLocal ]; then echo build/singeliLocal; else echo build/singeliSubmodule; fi)" $< $@ "obj/singeli/" ifeq (${i_singeli}, 1) # arithmetic table generator