diff --git a/makefiles/targets.mk b/makefiles/targets.mk index 1b2f5de..b63534d 100644 --- a/makefiles/targets.mk +++ b/makefiles/targets.mk @@ -102,9 +102,9 @@ endif libnatpmp.a: | sanity-checks ifeq ($(OS), Windows_NT) - + "$(MAKE)" -C vendor/nim-nat-traversal/vendor/libnatpmp CC=gcc CFLAGS="-Wall -Os -DWIN32 -DNATPMP_STATICLIB -DENABLE_STRNATPMPERR -DNATPMP_MAX_RETRIES=4" $@ $(HANDLE_OUTPUT) + + "$(MAKE)" -C vendor/nim-nat-traversal/vendor/libnatpmp CC=gcc CFLAGS="-Wall -Os -DWIN32 -DNATPMP_STATICLIB -DENABLE_STRNATPMPERR -DNATPMP_MAX_RETRIES=4 $(CFLAGS)" $@ $(HANDLE_OUTPUT) else - + "$(MAKE)" CFLAGS="-Wall -Os -DENABLE_STRNATPMPERR -DNATPMP_MAX_RETRIES=4" -C vendor/nim-nat-traversal/vendor/libnatpmp $@ $(HANDLE_OUTPUT) + + "$(MAKE)" CFLAGS="-Wall -Os -DENABLE_STRNATPMPERR -DNATPMP_MAX_RETRIES=4 $(CFLAGS)" -C vendor/nim-nat-traversal/vendor/libnatpmp $@ $(HANDLE_OUTPUT) endif #- depends on Git submodules being initialised diff --git a/scripts/build_nim.sh b/scripts/build_nim.sh index 40a1d0a..f306467 100755 --- a/scripts/build_nim.sh +++ b/scripts/build_nim.sh @@ -27,7 +27,7 @@ CI_CACHE="$4" [[ -z "$CC" ]] && CC="gcc" # to build csources in parallel, set MAKE="make -jN" [[ -z "$MAKE" ]] && MAKE="make" -# for 32-bit binaries on a 64-bit Windows host +# for 32-bit binaries on a 64-bit host UCPU="" [[ "$ARCH_OVERRIDE" == "x86" ]] && UCPU="ucpu=i686" [[ -z "$NIM_BUILD_MSG" ]] && NIM_BUILD_MSG="Building the Nim compiler"