Skip to content

K
k3s
Commit 764b238a authored by Bryan Boreham's avatar Bryan Boreham Committed by Bryan Boreham
Browse files
Options

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'"
parent 450a71cd
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
Makefile.generated_files
View file @ 764b238a
...@@ -237,14 +237,14 @@ $(DEEPCOPY_FILES): $(DEEPCOPY_GEN) ...@@ -237,14 +237,14 @@ $(DEEPCOPY_FILES): $(DEEPCOPY_GEN)
$(META_DIR)/$(DEEPCOPY_GEN).mk: $(META_DIR)/$(DEEPCOPY_GEN).mk:
mkdir -p $(@D); \ mkdir -p $(@D); \
(echo -n "$(DEEPCOPY_GEN): "; \ (echo -n "$(DEEPCOPY_GEN): "; \
DIRECT=$$(go list -e -f '{{.Dir}} {{.Dir}}/*.go' \ DIRECT=$$(go list -f '{{.Dir}} {{.Dir}}/*.go' \
./cmd/libs/go2idl/deepcopy-gen); \ ./cmd/libs/go2idl/deepcopy-gen); \
INDIRECT=$$(go list -e \ INDIRECT=$$(go list \
-f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' \
./cmd/libs/go2idl/deepcopy-gen \ ./cmd/libs/go2idl/deepcopy-gen \
| grep --color=never "^$(PRJ_SRC_PATH)" \ | grep --color=never "^$(PRJ_SRC_PATH)" \
| sed 's|^$(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 \ echo $$DIRECT $$INDIRECT \
| sed 's/ / \\=,/g' \ | sed 's/ / \\=,/g' \
| tr '=,' '\n\t'; \ | tr '=,' '\n\t'; \
...@@ -416,14 +416,14 @@ $(CONVERSION_FILES): $(CONVERSION_GEN) ...@@ -416,14 +416,14 @@ $(CONVERSION_FILES): $(CONVERSION_GEN)
$(META_DIR)/$(CONVERSION_GEN).mk: $(META_DIR)/$(CONVERSION_GEN).mk:
mkdir -p $(@D); \ mkdir -p $(@D); \
(echo -n "$(CONVERSION_GEN): "; \ (echo -n "$(CONVERSION_GEN): "; \
DIRECT=$$(go list -e -f '{{.Dir}} {{.Dir}}/*.go' \ DIRECT=$$(go list -f '{{.Dir}} {{.Dir}}/*.go' \
./cmd/libs/go2idl/conversion-gen); \ ./cmd/libs/go2idl/conversion-gen); \
INDIRECT=$$(go list -e \ INDIRECT=$$(go list \
-f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' \
./cmd/libs/go2idl/conversion-gen \ ./cmd/libs/go2idl/conversion-gen \
| grep --color=never "^$(PRJ_SRC_PATH)" \ | grep --color=never "^$(PRJ_SRC_PATH)" \
| sed 's|^$(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 \ echo $$DIRECT $$INDIRECT \
| sed 's/ / \\=,/g' \ | sed 's/ / \\=,/g' \
| tr '=,' '\n\t'; \ | tr '=,' '\n\t'; \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment