Skip to content

Commit 9042501

Browse files
chore: adjust LIBSDS_LIBDIR in Makefile
1 parent e93a896 commit 9042501

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

Makefile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,9 @@ ifeq ($(USE_NWAKU), true)
242242
NIM_EXTRA_PARAMS += --passL:"-L$(LIBWAKU_LIBDIR)" --passL:"-lwaku"
243243
endif
244244

245-
STATUSGO_MAKE_PARAMS += NIM_SDS_HEADER_PATH="$(GIT_ROOT)/vendor/nim-sds/build/"
245+
LIBSDS_LIBDIR := $(GIT_ROOT)/vendor/nim-sds/build
246+
NIM_EXTRA_PARAMS += --passL:"-L$(LIBSDS_LIBDIR)" --passL:"-lsds"
247+
STATUSGO_MAKE_PARAMS += NIM_SDS_HEADER_PATH="$(LIBSDS_LIBDIR)"
246248
STATUSGO_MAKE_PARAMS += NIM_SDS_LIB_PATH="$(GIT_ROOT)/vendor/nim-sds/build/"
247249

248250
INCLUDE_DEBUG_SYMBOLS ?= false
@@ -861,12 +863,12 @@ run: $(RUN_TARGET)
861863

862864
run-linux: nim_status_client
863865
echo -e "\033[92mRunning:\033[39m bin/nim_status_client"
864-
LD_LIBRARY_PATH="$(QT_LIBDIR)":"$(LIBWAKU_LIBDIR)":"$(STATUSGO_LIBDIR)":"$(STATUSKEYCARDGO_LIBDIR)":"$(STATUSQ_INSTALL_PATH)/StatusQ":"$(LD_LIBRARY_PATH)" \
866+
LD_LIBRARY_PATH="$(QT_LIBDIR)":"$(LIBWAKU_LIBDIR)":"$(LIBSDS_LIBDIR)":"$(STATUSGO_LIBDIR)":"$(STATUSKEYCARDGO_LIBDIR)":"$(STATUSQ_INSTALL_PATH)/StatusQ":"$(LD_LIBRARY_PATH)" \
865867
./bin/nim_status_client $(ARGS)
866868

867869
run-linux-gdb: nim_status_client
868870
echo -e "\033[92mRunning:\033[39m bin/nim_status_client"
869-
LD_LIBRARY_PATH="$(QT_LIBDIR)":"$(LIBWAKU_LIBDIR)":"$(STATUSGO_LIBDIR)":"$(STATUSKEYCARDGO_LIBDIR)":"$(STATUSQ_INSTALL_PATH)/StatusQ":"$(LD_LIBRARY_PATH)" \
871+
LD_LIBRARY_PATH="$(QT_LIBDIR)":"$(LIBWAKU_LIBDIR)":"$(LIBSDS_LIBDIR)":"$(STATUSGO_LIBDIR)":"$(STATUSKEYCARDGO_LIBDIR)":"$(STATUSQ_INSTALL_PATH)/StatusQ":"$(LD_LIBRARY_PATH)" \
870872
gdb -ex=r ./bin/nim_status_client $(ARGS)
871873

872874
run-macos: nim_status_client
@@ -889,7 +891,7 @@ NIM_TEST_FILES := $(wildcard test/nim/*.nim)
889891
NIM_TESTS := $(foreach test_file,$(NIM_TEST_FILES),nim-test-run/$(test_file))
890892

891893
nim-test-run/%: | dotherside $(STATUSGO) $(QRCODEGEN)
892-
LD_LIBRARY_PATH="$(QT_LIBDIR)":"$(LIBWAKU_LIBDIR)":"$(STATUSGO_LIBDIR)":"$(LD_LIBRARY_PATH)" $(ENV_SCRIPT) \
894+
LD_LIBRARY_PATH="$(QT_LIBDIR)":"$(LIBWAKU_LIBDIR)":"$(LIBSDS_LIBDIR)":"$(STATUSGO_LIBDIR)":"$(LD_LIBRARY_PATH)" $(ENV_SCRIPT) \
893895
nim c $(NIM_PARAMS) $(NIM_EXTRA_PARAMS) --mm:refc --passL:"-L$(STATUSGO_LIBDIR)" --passL:"-lstatus" --passL:"$(QRCODEGEN)" -r $(subst nim-test-run/,,$@)
894896

895897
tests-nim-linux: $(NIM_TESTS)

0 commit comments

Comments
 (0)