From 0ab6f950a44d5487500282283895fec46a04e63e Mon Sep 17 00:00:00 2001 From: Ivan FB Date: Fri, 27 Mar 2026 10:49:48 +0100 Subject: [PATCH] update ARCH logic in Makefile in waku.nimble --- Makefile | 5 +++-- waku.nimble | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index ecc3338cc..4523de291 100644 --- a/Makefile +++ b/Makefile @@ -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/$@" diff --git a/waku.nimble b/waku.nimble index 33fcf87ae..ccd781c96 100644 --- a/waku.nimble +++ b/waku.nimble @@ -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,