status-im
/
nimbus-build-system
mirror of https://github.com/status-im/nimbus-build-system.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

libnatpmp.a: use CFLAGS from the environment

This commit is contained in:
Ștefan Talpalaru 2020-09-22 19:32:19 +02:00
parent 41272d2002
commit 79469de156
No known key found for this signature in database
GPG Key ID: CBF7934204F1B6F9
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
makefiles/targets.mk
View File

@ -102,9 +102,9 @@ endif
libnatpmp.a: | sanity-checks libnatpmp.a: | sanity-checks
ifeq ($(OS), Windows_NT) 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 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 endif
#- depends on Git submodules being initialised #- depends on Git submodules being initialised

2
scripts/build_nim.sh
View File

@ -27,7 +27,7 @@ CI_CACHE="$4"
[[ -z "$CC" ]] && CC="gcc" [[ -z "$CC" ]] && CC="gcc"
# to build csources in parallel, set MAKE="make -jN" # to build csources in parallel, set MAKE="make -jN"
[[ -z "$MAKE" ]] && MAKE="make" [[ -z "$MAKE" ]] && MAKE="make"
# for 32-bit binaries on a 64-bit Windows host # for 32-bit binaries on a 64-bit host
UCPU="" UCPU=""
[[ "$ARCH_OVERRIDE" == "x86" ]] && UCPU="ucpu=i686" [[ "$ARCH_OVERRIDE" == "x86" ]] && UCPU="ucpu=i686"
[[ -z "$NIM_BUILD_MSG" ]] && NIM_BUILD_MSG="Building the Nim compiler" [[ -z "$NIM_BUILD_MSG" ]] && NIM_BUILD_MSG="Building the Nim compiler"