fix: common cgo_cflags and cgo_ldflags

Author: igor-sirotin

Makefile

@@ -40,6 +40,9 @@ else
  detected_OS := $(strip $(shell uname))
 endif
 
+CGO_CFLAGS =
+CGO_LDFLAGS = -v
+
 ifeq ($(MAKECMDGOALS),statusgo-android-library)
     ARCH ?= arm64
     ANDROID_NDK_ROOT ?= $(shell find /nix/store -path "*android-sdk-ndk-27.2.12479018/libexec/android-sdk/ndk/27.2.12479018" -type d 2>/dev/null | head -1)
@@ -50,7 +53,9 @@ ifeq ($(MAKECMDGOALS),statusgo-android-library)
     else
         MOBILE_GOARCH := $(ARCH)
     endif
-    ANDROID_BUILD_FLAGS := CC="$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/$(HOST_OS)-x86_64/bin/clang --target=aarch64-linux-android$(ANDROID_API) --sysroot=$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/$(HOST_OS)-x86_64/sysroot" CGO_CFLAGS="-Os -flto -fembed-bitcode" CGO_LDFLAGS="-Os -flto" CGO_ENABLED=1 GOOS=android GOARCH=$(MOBILE_GOARCH)
+    ANDROID_BUILD_FLAGS := CC="$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/$(HOST_OS)-x86_64/bin/clang --target=aarch64-linux-android$(ANDROID_API) --sysroot=$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/$(HOST_OS)-x86_64/sysroot" CGO_ENABLED=1 GOOS=android GOARCH=$(MOBILE_GOARCH)
+    CGO_CFLAGS += -Os -flto -fembed-bitcode
+    CGO_LDFLAGS += -Os -flto
 endif
 
 ifeq ($(MAKECMDGOALS),statusgo-ios-library)
@@ -62,7 +67,9 @@ ifeq ($(MAKECMDGOALS),statusgo-ios-library)
     else
         MOBILE_GOARCH := $(ARCH)
     endif
-    IOS_BUILD_FLAGS := CGO_LDFLAGS="-Os -flto" CGO_ENABLED=1 GOOS=ios GOARCH=$(MOBILE_GOARCH)
+    IOS_BUILD_FLAGS := CGO_ENABLED=1 GOOS=ios GOARCH=$(MOBILE_GOARCH)
+	CGO_CFLAGS += -Os -flto -arch $(ARCH) -isysroot $$(xcrun --sdk $(IPHONE_SDK) --show-sdk-path) -miphoneos-version-min=$(IOS_TARGET) -fembed-bitcode
+    CGO_LDFLAGS += -Os -flto
 endif
 
 ifeq ($(detected_OS),Darwin)
@@ -79,7 +86,6 @@ else
  GOBIN_SHARED_LIB_CGO_LDFLAGS := CGO_LDFLAGS="-Wl,-soname,libstatus.so.0"
 endif
 
-CGO_CFLAGS = -I/$(JAVA_HOME)/include -I/$(JAVA_HOME)/include/darwin
 export GOPATH ?= $(HOME)/go
 
 GIT_ROOT ?= $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
@@ -88,12 +94,16 @@ GIT_AUTHOR ?= $(shell git config user.email || echo $$USER)
 
 BUILD_TAGS ?= gowaku_no_rln
 
+NWAKU_DIR ?= $(CURDIR)/third_party/nwaku
 ifeq ($(USE_NWAKU), true)
-BUILD_TAGS += use_nwaku
+	BUILD_TAGS += use_nwaku
+	CGO_CFLAGS += -I${NWAKU_DIR}/library/
+	CGO_LDFLAGS += -L${NWAKU_DIR}/build/ -lwaku -Wl,-rpath,${NWAKU_DIR}/build/
 endif
 
 BUILD_FLAGS ?= -ldflags=""
 BUILD_FLAGS_MOBILE ?=
+BUILD_ENV = CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)"
 
 networkid ?= StatusChain
 
@@ -165,34 +175,30 @@ all: $(GO_CMD_NAMES)
 .PHONY: $(GO_CMD_NAMES) $(GO_CMD_PATHS) $(GO_CMD_BUILDS)
 $(GO_CMD_BUILDS): generate
 $(GO_CMD_BUILDS): ##@build Build any Go project from cmd folder
-	go build -mod=vendor -v \
+	$(BUILD_ENV) go build -mod=vendor -v \
 		-tags '$(BUILD_TAGS)' $(BUILD_FLAGS) \
 		-o ./$@ ./cmd/$(notdir $@)
 	@echo "Compilation done."
 	@echo "Run \"build/bin/$(notdir $@) -h\" to view available commands."
 
 
-NWAKU_DIR ?= $(CURDIR)/third_party/nwaku
 LIBWAKU := $(NWAKU_DIR)/build/libwaku.$(LIBWAKU_EXT)
-export CGO_CFLAGS = -I${NWAKU_DIR}/library/
-export CGO_LDFLAGS = -L${NWAKU_DIR}/build/ -lwaku -L${NWAKU_DIR} -Wl,-rpath,${NWAKU_DIR}/build/
 
 $(LIBWAKU):
 ifeq ($(USE_NWAKU),true)
 	@echo "Building libwaku"
-	git submodule update --init
+	git submodule update --init --recursive
 	$(MAKE) -C $(NWAKU_DIR) libwaku
 endif
 
-build-libwaku: $(LIBWAKU))
+build-libwaku: $(LIBWAKU)
 
 test-libwaku: | $(LIBWAKU)
-	go test -tags '$(BUILD_TAGS) use_nwaku' -run TestDial ./wakuv2/... -count 1 -v -json | jq -r '.Output'
+	$(BUILD_ENV) go test -tags '$(BUILD_TAGS)' -run TestDial ./wakuv2/... \-count 1 -v -json | jq -r '.Output'
 
-clean-libwaku: WAKU_GO_BINDINGS_DIR ?= $$(go list -m -f '{{.Dir}}' github.com/waku-org/waku-go-bindings)
 clean-libwaku:
 	@echo "Removing libwaku"
-	$(MAKE) -C "${WAKU_GO_BINDINGS_DIR}/waku" clean
+	$(MAKE) -C "${NWAKU_DIR}/waku" clean
 
 rebuild-libwaku: | clean-libwaku $(LIBWAKU)
 
@@ -229,7 +235,7 @@ statusgo-c-bindings:
 statusgo-library: generate
 statusgo-library: statusgo-c-bindings $(LIBWAKU) ##@cross-compile Build status-go as static library for current platform
 	@echo "Building static library..."
-	go build \
+	$(BUILD_ENV) go build \
 		-tags '$(BUILD_TAGS)' \
 		$(BUILD_FLAGS) \
 		-buildmode=c-archive \
@@ -242,7 +248,7 @@ statusgo-shared-library: generate
 statusgo-shared-library: statusgo-c-bindings $(LIBWAKU) ##@cross-compile Build status-go as shared library for current platform
 	@echo "Building shared library..."
 	@echo "Tags: $(BUILD_TAGS)"
-	$(GOBIN_SHARED_LIB_CFLAGS) $(GOBIN_SHARED_LIB_CGO_LDFLAGS) go build \
+	$(BUILD_ENV) $(GOBIN_SHARED_LIB_CFLAGS) $(GOBIN_SHARED_LIB_CGO_LDFLAGS) go build \
 		-tags '$(BUILD_TAGS)' \
 		$(BUILD_FLAGS) \
 		-buildmode=c-shared \
@@ -259,7 +265,7 @@ endif
 
 statusgo-android-library: generate statusgo-c-bindings $(LIBWAKU) ##@cross-compile Build status-go as Android mobile library
 	@echo "Building Android mobile library..."
-	$(ANDROID_BUILD_FLAGS) go build -buildmode=c-shared -tags 'gowaku_no_rln nowatchdog disable_torrent' \
+	$(BUILD_ENV) $(ANDROID_BUILD_FLAGS) go build -buildmode=c-shared -tags 'gowaku_no_rln nowatchdog disable_torrent' \
 		-ldflags="-checklinkname=0 -X github.com/status-im/status-go/vendor/github.com/ethereum/go-ethereum/metrics.EnabledStr=true" \
 		-o "build/bin/libstatus.so" ./build/bin/statusgo-lib
 	@echo "Android library built"
@@ -269,8 +275,7 @@ statusgo-ios-library: generate statusgo-c-bindings $(LIBWAKU) ##@cross-compile B
 	@echo "Building iOS mobile library..."
 	DEVELOPER_DIR="/Applications/Xcode.app/Contents/Developer" \
 	CC="$$(xcrun --sdk $(IPHONE_SDK) --find clang)" \
-	CGO_CFLAGS="-Os -flto -arch $(ARCH) -isysroot $$(xcrun --sdk $(IPHONE_SDK) --show-sdk-path) -miphoneos-version-min=$(IOS_TARGET) -fembed-bitcode" \
-	$(IOS_BUILD_FLAGS) go build -buildmode=c-archive -tags 'gowaku_no_rln nowatchdog disable_torrent' \
+	$(BUILD_ENV) $(IOS_BUILD_FLAGS) go build -buildmode=c-archive -tags 'gowaku_no_rln nowatchdog disable_torrent' \
 		-ldflags="-checklinkname=0 -X github.com/status-im/status-go/vendor/github.com/ethereum/go-ethereum/metrics.EnabledStr=true" \
 		-o "build/bin/libstatus.a" ./build/bin/statusgo-lib
 	@echo "iOS library built"
@@ -305,7 +310,7 @@ generate: GO_GENERATE_CMD ?= $$(which go-generate-fast || echo 'go generate')
 generate: export GO_GENERATE_FAST_DEBUG ?= false
 generate: export GO_GENERATE_FAST_RECACHE ?= false
 generate:  ##@ Run generate for all given packages using go-generate-fast, fallback to `go generate` (e.g. for docker)
-	@GOROOT=$$(go env GOROOT) $(GO_GENERATE_CMD) $(PACKAGES)
+	@#GOROOT=$$(go env GOROOT) $(GO_GENERATE_CMD) $(PACKAGES)
 
 generate-contracts:
 	go generate ./contracts