From 88d9dac1de04fb6fe5d9764805eb02313996a0d0 Mon Sep 17 00:00:00 2001 From: Igor Sirotin Date: Thu, 27 Jun 2024 17:06:44 +0200 Subject: [PATCH] chore: add nim-libbacktrace --- .gitmodules | 5 +++++ Makefile | 6 +++++- vendor/nim-libbacktrace | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) create mode 160000 vendor/nim-libbacktrace diff --git a/.gitmodules b/.gitmodules index edee481b4f..194d8c5db2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -114,3 +114,8 @@ [submodule "vendor/qzxing"] path = vendor/qzxing url = https://github.com/status-im/qzxing.git +[submodule "vendor/nim-libbacktrace"] + path = vendor/nim-libbacktrace + url = https://github.com/status-im/nim-libbacktrace.git + ignore = untracked + branch = master diff --git a/Makefile b/Makefile index 267e9d70df..5d50f37fb5 100644 --- a/Makefile +++ b/Makefile @@ -544,7 +544,7 @@ else endif $(NIM_STATUS_CLIENT): NIM_PARAMS += $(RESOURCES_LAYOUT) -$(NIM_STATUS_CLIENT): $(NIM_SOURCES) | statusq dotherside check-qt-dir $(STATUSGO) $(STATUSKEYCARDGO) $(QRCODEGEN) $(FLEETS) rcc compile-translations deps +$(NIM_STATUS_CLIENT): $(NIM_SOURCES) | statusq dotherside check-qt-dir $(STATUSGO) $(STATUSKEYCARDGO) $(QRCODEGEN) $(FLEETS) rcc compile-translations deps libbacktrace echo -e $(BUILD_MSG) "$@" $(ENV_SCRIPT) nim c $(NIM_PARAMS) \ --passL:"-L$(STATUSGO_LIBDIR)" \ @@ -841,4 +841,8 @@ tests-nim-linux: | dotherside LD_LIBRARY_PATH="$(QT5_LIBDIR):$(LD_LIBRARY_PATH)" \ $(foreach nimfile,$(NIM_TEST_FILES),$(ENV_SCRIPT) nim c $(NIM_PARAMS) $(NIM_EXTRA_PARAMS) -r $(nimfile);) +libbacktrace: + echo -e "\033[92mBuilding:\033[39m nim-libbacktrace" + + $(MAKE) -C vendor/nim-libbacktrace --no-print-directory BUILD_CXX_LIB=0 $(HANDLE_OUTPUT) + endif # "variables.mk" was not included diff --git a/vendor/nim-libbacktrace b/vendor/nim-libbacktrace new file mode 160000 index 0000000000..4db9cae5ac --- /dev/null +++ b/vendor/nim-libbacktrace @@ -0,0 +1 @@ +Subproject commit 4db9cae5ac0225e3439f577f5c5cd67086232b3f