status-im/nimbus-build-system-desktop
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-build-system-desktop.git synced 2025-01-12 23:04:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

NIM_COMMIT fix (#29)

Browse Source
This commit is contained in:
Ștefan Talpalaru 2021-11-22 18:13:01 +01:00 committed by GitHub
parent 08000b4bf0
commit 93ad4a4b20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
makefiles/targets.mk
View File

@ -65,6 +65,7 @@ endif
#- 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
#- handles the case where NIM_COMMIT was previously used to build a non-default compiler
#- forces a rebuild of csources, Nimble and a complete compiler rebuild, in case we're called after pulling a new Nim version
#- uses our Git submodules for csources and Nimble (Git doesn't let us place them in another submodule)
#- build_all.sh looks at the parent dir to decide whether to copy the resulting csources binary there,
@ -73,7 +74,8 @@ endif
#- macOS is also a special case, with its "ln" not supporting "-r"
#- the AppVeyor 32-bit build is done on a 64-bit image, so we need to override the architecture detection with ARCH_OVERRIDE
build-nim: | sanity-checks
+ NIM_BUILD_MSG="$(BUILD_MSG) Nim compiler" \
+ if [[ -z "$(NIM_COMMIT)" ]]; then git submodule update --init --recursive "$(BUILD_SYSTEM_DIR)"; fi; \
NIM_BUILD_MSG="$(BUILD_MSG) Nim compiler" \
V=$(V) \
CC=$(CC) \
MAKE="$(MAKE)" \