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

support spaces in $(MAKE) (#1603)

This commit is contained in:
Ștefan Talpalaru 2020-09-04 08:33:37 +02:00 committed by GitHub
parent e4a43f7628
commit aa3298f0ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -119,13 +119,13 @@ deps: | libbacktrace
endif endif
clean-cross: clean-cross:
+ [[ -e vendor/nim-nat-traversal/vendor/miniupnp/miniupnpc ]] && $(MAKE) -C vendor/nim-nat-traversal/vendor/miniupnp/miniupnpc clean $(HANDLE_OUTPUT) || true + [[ -e vendor/nim-nat-traversal/vendor/miniupnp/miniupnpc ]] && "$(MAKE)" -C vendor/nim-nat-traversal/vendor/miniupnp/miniupnpc clean $(HANDLE_OUTPUT) || true
+ [[ -e vendor/nim-nat-traversal/vendor/libnatpmp ]] && $(MAKE) -C vendor/nim-nat-traversal/vendor/libnatpmp clean $(HANDLE_OUTPUT) || true + [[ -e vendor/nim-nat-traversal/vendor/libnatpmp ]] && "$(MAKE)" -C vendor/nim-nat-traversal/vendor/libnatpmp clean $(HANDLE_OUTPUT) || true
#- deletes and recreates "beacon_chain.nims" which on Windows is a copy instead of a proper symlink #- deletes and recreates "beacon_chain.nims" which on Windows is a copy instead of a proper symlink
update: | update-common update: | update-common
rm -f beacon_chain.nims && \ rm -f beacon_chain.nims && \
$(MAKE) beacon_chain.nims $(HANDLE_OUTPUT) "$(MAKE)" beacon_chain.nims $(HANDLE_OUTPUT)
# symlink # symlink
beacon_chain.nims: beacon_chain.nims:
@ -133,7 +133,7 @@ beacon_chain.nims:
# nim-libbacktrace # nim-libbacktrace
libbacktrace: libbacktrace:
+ $(MAKE) -C vendor/nim-libbacktrace --no-print-directory BUILD_CXX_LIB=0 + "$(MAKE)" -C vendor/nim-libbacktrace --no-print-directory BUILD_CXX_LIB=0
# Windows 10 with WSL enabled, but no distro installed, fails if "../../nimble.sh" is executed directly # Windows 10 with WSL enabled, but no distro installed, fails if "../../nimble.sh" is executed directly
# in a Makefile recipe but works when prefixing it with `bash`. No idea how the PATH is overridden. # in a Makefile recipe but works when prefixing it with `bash`. No idea how the PATH is overridden.
@ -224,7 +224,7 @@ medalla-vc: | beacon_node signing_process validator_client
ifneq ($(LOG_LEVEL), TRACE) ifneq ($(LOG_LEVEL), TRACE)
medalla-dev: medalla-dev:
+ $(MAKE) LOG_LEVEL=TRACE $@ + "$(MAKE)" LOG_LEVEL=TRACE $@
else else
medalla-dev: | beacon_node signing_process medalla-dev: | beacon_node signing_process
mkdir -p build/data/shared_medalla_$(NODE_ID) mkdir -p build/data/shared_medalla_$(NODE_ID)
@ -334,7 +334,7 @@ ntu: | build deps
clean: | clean-common clean: | clean-common
rm -rf build/{$(TOOLS_CSV),all_tests,*_node,*ssz*,beacon_node_*,block_sim,state_sim,transition*} rm -rf build/{$(TOOLS_CSV),all_tests,*_node,*ssz*,beacon_node_*,block_sim,state_sim,transition*}
ifneq ($(USE_LIBBACKTRACE), 0) ifneq ($(USE_LIBBACKTRACE), 0)
+ $(MAKE) -C vendor/nim-libbacktrace clean $(HANDLE_OUTPUT) + "$(MAKE)" -C vendor/nim-libbacktrace clean $(HANDLE_OUTPUT)
endif endif
libnfuzz.so: | build deps libnfuzz.so: | build deps

2
vendor/nimbus-build-system vendored

@ -1 +1 @@
Subproject commit e104d62e4de22c68af9e000c2935f38f9d5f4e66 Subproject commit 7c08b785226d8c1939856d50a64d4a91937df0af