status-im
/
nimbus-build-system
mirror of https://github.com/status-im/nimbus-build-system.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

decouple $(NIM_BINARY) from update-common

This commit is contained in:
Ștefan Talpalaru 2020-04-15 18:25:36 +02:00
parent 988217cc53
commit 7b0a7f88c2
No known key found for this signature in database
GPG Key ID: CBF7934204F1B6F9
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
makefiles/targets.mk
View File

@ -21,9 +21,11 @@ sanity-checks:
#- runs only the first time and after `make update`, so have "normal" #- runs only the first time and after `make update`, so have "normal"
# (timestamp-checked) prerequisites here # (timestamp-checked) prerequisites here
#- $(NIM_BINARY) is both a proxy for submodules having been initialised deps-common: sanity-checks $(NIMBLE_DIR) nat-libs
# and a check for the actual compiler build # - don't build our Nim target if it's not going to be used
deps-common: sanity-checks $(NIM_BINARY) $(NIMBLE_DIR) nat-libs ifeq ($(USE_SYSTEM_NIM), 0)
deps-common: $(NIM_BINARY)
endif
#- conditionally re-builds the Nim compiler (not usually needed, because `make update` calls this rule; delete $(NIM_BINARY) to force it) #- conditionally re-builds the Nim compiler (not usually needed, because `make update` calls this rule; delete $(NIM_BINARY) to force it)
#- allows parallel building with the '+' prefix #- allows parallel building with the '+' prefix
@ -48,7 +50,7 @@ build-nim: | sanity-checks
#- deletes the ".nimble" dir to force the execution of the "deps" target #- deletes the ".nimble" dir to force the execution of the "deps" target
#- allows parallel building with the '+' prefix #- allows parallel building with the '+' prefix
#- rebuilds the Nim compiler if the corresponding submodule is updated #- rebuilds the Nim compiler if the corresponding submodule is updated
$(NIM_BINARY) update-common: | sanity-checks update-common: | sanity-checks
git submodule update --init --recursive || true git submodule update --init --recursive || true
# changing URLs in a submodule's submodule means we have to sync and update twice # changing URLs in a submodule's submodule means we have to sync and update twice
git submodule sync --quiet --recursive git submodule sync --quiet --recursive
@ -56,6 +58,10 @@ $(NIM_BINARY) update-common: | sanity-checks
rm -rf $(NIMBLE_DIR) rm -rf $(NIMBLE_DIR)
+ $(MAKE) build-nim + $(MAKE) build-nim
#- rebuilds the Nim compiler if the corresponding submodule is updated
$(NIM_BINARY): | sanity-checks
+ $(MAKE) build-nim
# don't use this target, or you risk updating dependency repos that are not ready to be used in Nimbus # don't use this target, or you risk updating dependency repos that are not ready to be used in Nimbus
update-remote: update-remote:
git submodule update --remote git submodule update --remote
@ -80,7 +86,7 @@ endif
#- depends on Git submodules being initialised #- depends on Git submodules being initialised
#- fakes a Nimble package repository with the minimum info needed by the Nim compiler #- fakes a Nimble package repository with the minimum info needed by the Nim compiler
# for runtime path (i.e.: the second line in $(NIMBLE_DIR)/pkgs/*/*.nimble-link) # for runtime path (i.e.: the second line in $(NIMBLE_DIR)/pkgs/*/*.nimble-link)
$(NIMBLE_DIR): | $(NIM_BINARY) $(NIMBLE_DIR):
mkdir -p $(NIMBLE_DIR)/pkgs mkdir -p $(NIMBLE_DIR)/pkgs
NIMBLE_DIR="$(CURDIR)/$(NIMBLE_DIR)" PWD_CMD="$(PWD)" \ NIMBLE_DIR="$(CURDIR)/$(NIMBLE_DIR)" PWD_CMD="$(PWD)" \
git submodule foreach --quiet '$(CURDIR)/$(BUILD_SYSTEM_DIR)/scripts/create_nimble_link.sh "$$sm_path"' git submodule foreach --quiet '$(CURDIR)/$(BUILD_SYSTEM_DIR)/scripts/create_nimble_link.sh "$$sm_path"'