respect nogit=1 in makefile-only build
This commit is contained in:
parent
989970f7fd
commit
217da10fa5
@ -92,8 +92,7 @@ endif
|
|||||||
BYTECODE_DIR = $(shell if [ -d build/bytecodeLocal ]; then echo bytecodeLocal; else echo bytecodeSubmodule; fi)
|
BYTECODE_DIR = $(shell if [ -d build/bytecodeLocal ]; then echo bytecodeLocal; else echo bytecodeSubmodule; fi)
|
||||||
ifeq ($(BYTECODE_DIR),bytecodeLocal)
|
ifeq ($(BYTECODE_DIR),bytecodeLocal)
|
||||||
custom = 1
|
custom = 1
|
||||||
endif
|
else
|
||||||
ifeq ($(BYTECODE_DIR),bytecodeSubmodule)
|
|
||||||
ifeq ($(i_USE_BC_SUBMODULE),)
|
ifeq ($(i_USE_BC_SUBMODULE),)
|
||||||
i_USE_BC_SUBMODULE=1
|
i_USE_BC_SUBMODULE=1
|
||||||
endif
|
endif
|
||||||
@ -160,7 +159,11 @@ else ifeq ($(origin builddir),command line)
|
|||||||
else # run build
|
else # run build
|
||||||
|
|
||||||
ifeq ($(i_USE_BC_SUBMODULE),1)
|
ifeq ($(i_USE_BC_SUBMODULE),1)
|
||||||
@git submodule update --init build/bytecodeSubmodule || (echo 'Failed to initialize submodule; clone CBQN as a git repo, or place local copies in build/ (see README.md#submodules).' && false)
|
ifeq ($(nogit),1)
|
||||||
|
@echo "git needed for updating build/singeliSubmodule, but nogit=1 specified" && false
|
||||||
|
else
|
||||||
|
@git submodule update --init build/bytecodeSubmodule || (echo 'Failed to initialize build/bytecodeSubmodule; clone CBQN as a git repo, or place a local copy in build/bytecodeLocal (see README.md).' && false)
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
@export bd=$$("$(MAKEHERE)" builddir); \
|
@export bd=$$("$(MAKEHERE)" builddir); \
|
||||||
[ "build/obj/" = "$$bd" ] && echo "Neither shasum nor sha256sum was found; cannot use custom configurations" && exit 1; \
|
[ "build/obj/" = "$$bd" ] && echo "Neither shasum nor sha256sum was found; cannot use custom configurations" && exit 1; \
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user