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

Merge branch 'libbacktrace' into devel

This commit is contained in:
Ștefan Talpalaru 2020-03-31 18:44:43 +02:00
parent daabb1b5b2 3239b62904
commit 79dd632777
No known key found for this signature in database
GPG Key ID: CBF7934204F1B6F9
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -58,12 +58,11 @@ endif
# must be included after the default target # must be included after the default target
-include $(BUILD_SYSTEM_DIR)/makefiles/targets.mk -include $(BUILD_SYSTEM_DIR)/makefiles/targets.mk
# "--import" can't be added to config.nims, for some reason # "--define:release" implies "--stacktrace:off" and it cannot be added to config.nims
# "--define:release" implies "--stacktrace:off" and it cannot be added to config.nims either
ifeq ($(USE_LIBBACKTRACE), 0) ifeq ($(USE_LIBBACKTRACE), 0)
NIM_PARAMS := $(NIM_PARAMS) -d:debug -d:disable_libbacktrace NIM_PARAMS := $(NIM_PARAMS) -d:debug -d:disable_libbacktrace
else else
NIM_PARAMS := $(NIM_PARAMS) -d:release --import:libbacktrace NIM_PARAMS := $(NIM_PARAMS) -d:release
endif endif
#- the Windows build fails on Azure Pipelines if we have Unicode symbols copy/pasted here, #- the Windows build fails on Azure Pipelines if we have Unicode symbols copy/pasted here,
@ -95,7 +94,7 @@ beacon_chain.nims:
# nim-libbacktrace # nim-libbacktrace
libbacktrace: libbacktrace:
+ $(MAKE) -C vendor/nim-libbacktrace BUILD_CXX_LIB=0 + $(MAKE) -C vendor/nim-libbacktrace BUILD_CXX_LIB=0 $(HANDLE_OUTPUT)
# 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.

3
config.nims
View File

@ -49,8 +49,7 @@ if not defined(macosx):
if not (defined(windows) and defined(i386)) and not defined(disable_libbacktrace): if not (defined(windows) and defined(i386)) and not defined(disable_libbacktrace):
# light-weight stack traces using libbacktrace and libunwind # light-weight stack traces using libbacktrace and libunwind
--define:nimStackTraceOverride --define:nimStackTraceOverride
# "--import:libbacktrace" is added to NIM_PARAMS inside the Makefile, switch("import", "libbacktrace")
# because it doesn't work in here ("Error: undeclared identifier: 'copyMem'", like it kicks in in some other NimScript file)
--define:nimOldCaseObjects # https://github.com/status-im/nim-confutils/issues/9 --define:nimOldCaseObjects # https://github.com/status-im/nim-confutils/issues/9

2
vendor/nim-libbacktrace vendored

@ -1 +1 @@
Subproject commit 3b29eed05a204e4efe5b54a50dc4cbe2dfd38c1b Subproject commit da216986c635599dccffa2e71eabad03653e5aef