Merge branch 'libbacktrace' into devel
This commit is contained in:
commit
79dd632777
7
Makefile
7
Makefile
|
@ -58,12 +58,11 @@ endif
|
|||
# must be included after the default target
|
||||
-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 either
|
||||
# "--define:release" implies "--stacktrace:off" and it cannot be added to config.nims
|
||||
ifeq ($(USE_LIBBACKTRACE), 0)
|
||||
NIM_PARAMS := $(NIM_PARAMS) -d:debug -d:disable_libbacktrace
|
||||
else
|
||||
NIM_PARAMS := $(NIM_PARAMS) -d:release --import:libbacktrace
|
||||
NIM_PARAMS := $(NIM_PARAMS) -d:release
|
||||
endif
|
||||
|
||||
#- the Windows build fails on Azure Pipelines if we have Unicode symbols copy/pasted here,
|
||||
|
@ -95,7 +94,7 @@ beacon_chain.nims:
|
|||
|
||||
# nim-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
|
||||
# in a Makefile recipe but works when prefixing it with `bash`. No idea how the PATH is overridden.
|
||||
|
|
|
@ -49,8 +49,7 @@ if not defined(macosx):
|
|||
if not (defined(windows) and defined(i386)) and not defined(disable_libbacktrace):
|
||||
# light-weight stack traces using libbacktrace and libunwind
|
||||
--define:nimStackTraceOverride
|
||||
# "--import:libbacktrace" is added to NIM_PARAMS inside the Makefile,
|
||||
# because it doesn't work in here ("Error: undeclared identifier: 'copyMem'", like it kicks in in some other NimScript file)
|
||||
switch("import", "libbacktrace")
|
||||
|
||||
--define:nimOldCaseObjects # https://github.com/status-im/nim-confutils/issues/9
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 3b29eed05a204e4efe5b54a50dc4cbe2dfd38c1b
|
||||
Subproject commit da216986c635599dccffa2e71eabad03653e5aef
|
Loading…
Reference in New Issue