From 853929b4302f3ad4924201a54ac7657a2bb92a39 Mon Sep 17 00:00:00 2001 From: Patryk Osmaczko Date: Tue, 6 Jun 2023 23:44:12 +0200 Subject: [PATCH] chore(Makefile): ensure LD_LIBRARY_PATH is not overriden --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b19a132a05..7cf23d3d97 100644 --- a/Makefile +++ b/Makefile @@ -750,7 +750,7 @@ ICON_TOOL := node_modules/.bin/fileicon run-linux: nim_status_client echo -e "\033[92mRunning:\033[39m bin/nim_status_client" - LD_LIBRARY_PATH="$(QT5_LIBDIR)":"$(STATUSGO_LIBDIR)":"$(STATUSKEYCARDGO_LIBDIR)" \ + LD_LIBRARY_PATH="$(QT5_LIBDIR)":"$(STATUSGO_LIBDIR)":"$(STATUSKEYCARDGO_LIBDIR):$(LD_LIBRARY_PATH)" \ ./bin/nim_status_client run-macos: nim_status_client @@ -769,7 +769,7 @@ run-windows: nim_status_client $(NIM_WINDOWS_PREBUILT_DLLS) ./bin/nim_status_client.exe tests-nim-linux: | $(DOTHERSIDE) - LD_LIBRARY_PATH="$(QT5_LIBDIR)" \ + LD_LIBRARY_PATH="$(QT5_LIBDIR):$(LD_LIBRARY_PATH)" \ $(ENV_SCRIPT) nim c $(NIM_PARAMS) $(NIM_EXTRA_PARAMS) -r test/nim/message_model_test.nim endif # "variables.mk" was not included