move singeli submodule to build/

This commit is contained in:
dzaima 2022-11-17 19:45:18 +02:00
parent 1b64b4b548
commit 5239265a61
5 changed files with 8 additions and 7 deletions

1
.gitignore vendored
View File

@ -8,6 +8,7 @@ perf.*
/asm_*
/src/singeli/gen
/Singeli
build/singeliLocal
/local/
CBQNHeapDump
/test/ffi/ffiTest.o

4
.gitmodules vendored
View File

@ -1,3 +1,3 @@
[submodule "SingeliClone"]
path = SingeliClone
[submodule "build/singeliSubmodule"]
path = build/singeliSubmodule
url = https://github.com/mlochbaum/Singeli

@ -1 +0,0 @@
Subproject commit 6dbe5d5a424d7873210dd3b7e26999c2c0a33924

@ -0,0 +1 @@
Subproject commit d76f2befeca169e94feda44edc65c3785412745d

View File

@ -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