logos-messaging/logos-delivery
1
0
Fork 0
mirror of https://github.com/logos-messaging/logos-delivery.git synced 2026-03-28 20:03:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

update ARCH logic in Makefile in waku.nimble

Browse Source
This commit is contained in:
Ivan FB 2026-03-27 10:49:48 +01:00
parent b880761581
commit 0ab6f950a4
No known key found for this signature in database
GPG Key ID: DF0C67A04C543270
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -159,6 +159,7 @@ deps: | nimble
LIBRLN_BUILDDIR := $(CURDIR)/vendor/zerokit
LIBRLN_VERSION := v0.9.0
HOST_ARCH := $(shell uname -m)
ifeq ($(detected_OS),Windows)
LIBRLN_FILE ?= rln.lib
@ -403,10 +404,10 @@ else ifeq ($(detected_OS),Linux)
endif
libwaku: | librln $(NIMBLEDEPS_STAMP)
nimble --verbose libwaku$(BUILD_COMMAND) $(NIM_PARAMS) waku.nimble
ARCH=$(HOST_ARCH) nimble --verbose libwaku$(BUILD_COMMAND) $(NIM_PARAMS) waku.nimble
liblogosdelivery: | librln $(NIMBLEDEPS_STAMP)
nimble --verbose liblogosdelivery$(BUILD_COMMAND) $(NIM_PARAMS) waku.nimble
ARCH=$(HOST_ARCH) nimble --verbose liblogosdelivery$(BUILD_COMMAND) $(NIM_PARAMS) waku.nimble
logosdelivery_example: | build liblogosdelivery
@echo -e $(BUILD_MSG) "build/$@"

6
waku.nimble
View File

@ -101,7 +101,7 @@ proc buildLibrary(outLibNameAndExt: string, libName: string, extra_params = "",
var extra_params = extra_params
let nimParams = getEnv("NIM_PARAMS")
if nimParams.len > 0:
extra_params &= " " & nimParams
extra_params = nimParams & " " & extra_params
if `type` == "static":
exec "nim c" & " --out:build/" & outLibNameAndExt &
@ -122,9 +122,9 @@ proc buildLibrary(outLibNameAndExt: string, libName: string, extra_params = "",
proc getArch(): string =
let arch = getEnv("ARCH")
if arch != "": return $arch
if arch.len > 0: return arch
let (archFromUname, _) = gorgeEx("uname -m")
return $archFromUname
return archFromUname.strip()
proc buildLibDynamicWindows(libName: string) =
buildLibrary libName & ".dll", libName,