From 764b238a6043d5bc1450e52d8df8aed74710794e Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Mon, 18 Jul 2016 10:50:21 +0100 Subject: [PATCH] Remove -e from 'go list' so missing files will halt the build 'go list -e' sends the error to the template, which causes cryptic build errors like "No rule to make target `/*.go'" --- Makefile.generated_files | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.generated_files b/Makefile.generated_files index 1e4a83c9137..cd577b9f098 100644 --- a/Makefile.generated_files +++ b/Makefile.generated_files @@ -237,14 +237,14 @@ $(DEEPCOPY_FILES): $(DEEPCOPY_GEN) $(META_DIR)/$(DEEPCOPY_GEN).mk: mkdir -p $(@D); \ (echo -n "$(DEEPCOPY_GEN): "; \ - DIRECT=$$(go list -e -f '{{.Dir}} {{.Dir}}/*.go' \ + DIRECT=$$(go list -f '{{.Dir}} {{.Dir}}/*.go' \ ./cmd/libs/go2idl/deepcopy-gen); \ - INDIRECT=$$(go list -e \ + INDIRECT=$$(go list \ -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ ./cmd/libs/go2idl/deepcopy-gen \ | grep --color=never "^$(PRJ_SRC_PATH)" \ | sed 's|^$(PRJ_SRC_PATH)|./|' \ - | xargs go list -e -f '{{.Dir}} {{.Dir}}/*.go'); \ + | xargs go list -f '{{.Dir}} {{.Dir}}/*.go'); \ echo $$DIRECT $$INDIRECT \ | sed 's/ / \\=,/g' \ | tr '=,' '\n\t'; \ @@ -416,14 +416,14 @@ $(CONVERSION_FILES): $(CONVERSION_GEN) $(META_DIR)/$(CONVERSION_GEN).mk: mkdir -p $(@D); \ (echo -n "$(CONVERSION_GEN): "; \ - DIRECT=$$(go list -e -f '{{.Dir}} {{.Dir}}/*.go' \ + DIRECT=$$(go list -f '{{.Dir}} {{.Dir}}/*.go' \ ./cmd/libs/go2idl/conversion-gen); \ - INDIRECT=$$(go list -e \ + INDIRECT=$$(go list \ -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ ./cmd/libs/go2idl/conversion-gen \ | grep --color=never "^$(PRJ_SRC_PATH)" \ | sed 's|^$(PRJ_SRC_PATH)|./|' \ - | xargs go list -e -f '{{.Dir}} {{.Dir}}/*.go'); \ + | xargs go list -f '{{.Dir}} {{.Dir}}/*.go'); \ echo $$DIRECT $$INDIRECT \ | sed 's/ / \\=,/g' \ | tr '=,' '\n\t'; \