sts-sponsors team mailing list archive

[Alexsander de Souza <mp+442424@xxxxxxxxxxxxxxxxxx>]

Alexsander de Souza has proposed merging ~alexsander-souza/maas:fix_agent_make into maas:master.

Commit message:
fix makefile clean 

Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~alexsander-souza/maas/+git/maas/+merge/442424
-- 
Your team MAAS Maintainers is requested to review the proposed merge of ~alexsander-souza/maas:fix_agent_make into maas:master.

diff --git a/Makefile b/Makefile
index 6cf4682..8caf1e9 100644
--- a/Makefile
+++ b/Makefile
@@ -266,6 +266,7 @@ clean-ui-build:
 
 clean-go-bins:
 	$(MAKE) -C src/host-info clean
+	$(MAKE) -C src/maasagent clean
 .PHONY: clean-go-bins
 
 clean: clean-ui clean-go-bins
diff --git a/src/maasagent/Makefile b/src/maasagent/Makefile
index ecbc6cb..8541604 100644
--- a/src/maasagent/Makefile
+++ b/src/maasagent/Makefile
@@ -12,6 +12,7 @@ LDFLAGS := -ldflags '-s -w -extldflags "-static"'
 export GOCACHE := $(shell [ -d $(HOME)/.cache ] && echo $(HOME)/.cache/go-cache || mktemp --tmpdir -d tmp.go-cacheXXX)
 export GOMODCACHE := $(shell [ -d $(HOME)/go ] && echo $(HOME)/go/pkg/mod || mktemp --tmpdir -d tmp.go-mod-cacheXXX)
 export GOFLAGS := -mod=vendor
+export OUT_PREFIX
 
 default: build
 
@@ -21,7 +22,6 @@ ARTIFACTS := $(subst /,,$(subst cmd/,,$(wildcard cmd/*/)))
 
 .PHONY: build
 build: vendor
-	export OUT_PREFIX
 	$(MAKE) $(addprefix $(BUILD_DIR)/,$(ARTIFACTS))
 
 $(BUILD_DIR)/%: