diff --git a/build/makelib/common.mk b/build/makelib/common.mk index 2519103ef..7b8be4cda 100644 --- a/build/makelib/common.mk +++ b/build/makelib/common.mk @@ -131,7 +131,6 @@ SPACE := SPACE += # define a newline -define \n - +define NEWLINE endef diff --git a/build/makelib/golang.mk b/build/makelib/golang.mk index 8337870b3..1f306f3e4 100644 --- a/build/makelib/golang.mk +++ b/build/makelib/golang.mk @@ -127,13 +127,13 @@ go.init: go.build: @echo === go build $(PLATFORM) $(info Go version: $(shell $(GO) version)) - $(foreach p,$(GO_STATIC_PACKAGES),@CGO_ENABLED=$(CGO_ENABLED_VALUE) $(GO) build -v -o $(GO_OUT_DIR)/$(lastword $(subst /, ,$(p)))$(GO_OUT_EXT) $(GO_STATIC_FLAGS) $(p)${\n}) - $(foreach p,$(GO_TEST_PACKAGES),@CGO_ENABLED=$(CGO_ENABLED_VALUE) $(GO) test -v -c -o $(GO_TEST_OUTPUT)/$(lastword $(subst /, ,$(p)))$(GO_OUT_EXT) $(GO_STATIC_FLAGS) $(p)${\n}) + $(foreach p,$(GO_STATIC_PACKAGES),@CGO_ENABLED=$(CGO_ENABLED_VALUE) $(GO) build -v -o $(GO_OUT_DIR)/$(lastword $(subst /, ,$(p)))$(GO_OUT_EXT) $(GO_STATIC_FLAGS) $(p)$(NEWLINE)) + $(foreach p,$(GO_TEST_PACKAGES),@CGO_ENABLED=$(CGO_ENABLED_VALUE) $(GO) test -v -c -o $(GO_TEST_OUTPUT)/$(lastword $(subst /, ,$(p)))$(GO_OUT_EXT) $(GO_STATIC_FLAGS) $(p)$(NEWLINE)) .PHONY: go.install go.install: @echo === go install $(PLATFORM) - $(foreach p,$(GO_STATIC_PACKAGES),@CGO_ENABLED=$(CGO_ENABLED_VALUE) $(GO) install -v $(GO_STATIC_FLAGS) $(p)${\n}) + $(foreach p,$(GO_STATIC_PACKAGES),@CGO_ENABLED=$(CGO_ENABLED_VALUE) $(GO) install -v $(GO_STATIC_FLAGS) $(p)$(NEWLINE)) # GOJUNIT need to happen in order and NOT in parallel, so call them explicitly .PHONY: go.test.unit