Skip to content

K
k3s
Commit e967a773 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #28945 from aledbf/fix-make-mac

Automatic merge from submit-queue Fix make on Mac replacing sed with tr fixes #28930
parents 0af6d321 d3d56931
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
Makefile.generated_files
View file @ e967a773
...@@ -200,7 +200,7 @@ DEEPCOPY_FILES := $(addsuffix /$(DEEPCOPY_FILENAME), $(DEEPCOPY_DIRS)) ...@@ -200,7 +200,7 @@ DEEPCOPY_FILES := $(addsuffix /$(DEEPCOPY_FILENAME), $(DEEPCOPY_DIRS))
gen_deepcopy: $(DEEPCOPY_FILES) gen_deepcopy: $(DEEPCOPY_FILES)
if [[ -f $(META_DIR)/$(DEEPCOPY_GEN).todo ]]; then \ if [[ -f $(META_DIR)/$(DEEPCOPY_GEN).todo ]]; then \
$(DEEPCOPY_GEN) \ $(DEEPCOPY_GEN) \
-i $$(cat $(META_DIR)/$(DEEPCOPY_GEN).todo | paste -sd,) \ -i $$(cat $(META_DIR)/$(DEEPCOPY_GEN).todo | paste -sd, -) \
--bounding-dirs $(PRJ_SRC_PATH) \ --bounding-dirs $(PRJ_SRC_PATH) \
-O $(DEEPCOPY_BASENAME); \ -O $(DEEPCOPY_BASENAME); \
fi fi
...@@ -244,7 +244,7 @@ $(META_DIR)/$(DEEPCOPY_GEN).mk: ...@@ -244,7 +244,7 @@ $(META_DIR)/$(DEEPCOPY_GEN).mk:
./cmd/libs/go2idl/deepcopy-gen \ ./cmd/libs/go2idl/deepcopy-gen \
| grep "^$(PRJ_SRC_PATH)" \ | grep "^$(PRJ_SRC_PATH)" \
| xargs go list -e -f '{{.Dir}} {{.Dir}}/*.go'); \ | xargs go list -e -f '{{.Dir}} {{.Dir}}/*.go'); \
echo $$DIRECT $$INDIRECT | sed 's/ / \\\n\t/g'; \ echo $$DIRECT $$INDIRECT | sed 's/ / =,/g' | tr '=,' '\n\t'; \
) | sed "s|$$(pwd -P)/||" > $@.tmp; \ ) | sed "s|$$(pwd -P)/||" > $@.tmp; \
cmp -s $@.tmp $@ || cat $@.tmp > $@ && rm -f $@.tmp cmp -s $@.tmp $@ || cat $@.tmp > $@ && rm -f $@.tmp
...@@ -310,7 +310,7 @@ CONVERSION_FILES := $(addsuffix /$(CONVERSION_FILENAME), $(CONVERSION_DIRS)) ...@@ -310,7 +310,7 @@ CONVERSION_FILES := $(addsuffix /$(CONVERSION_FILENAME), $(CONVERSION_DIRS))
gen_conversion: $(CONVERSION_FILES) gen_conversion: $(CONVERSION_FILES)
if [[ -f $(META_DIR)/$(CONVERSION_GEN).todo ]]; then \ if [[ -f $(META_DIR)/$(CONVERSION_GEN).todo ]]; then \
$(CONVERSION_GEN) \ $(CONVERSION_GEN) \
-i $$(cat $(META_DIR)/$(CONVERSION_GEN).todo | paste -sd,) \ -i $$(cat $(META_DIR)/$(CONVERSION_GEN).todo | paste -sd, -) \
-O $(CONVERSION_BASENAME); \ -O $(CONVERSION_BASENAME); \
fi fi
...@@ -420,7 +420,7 @@ $(META_DIR)/$(CONVERSION_GEN).mk: ...@@ -420,7 +420,7 @@ $(META_DIR)/$(CONVERSION_GEN).mk:
./cmd/libs/go2idl/conversion-gen \ ./cmd/libs/go2idl/conversion-gen \
| grep "^$(PRJ_SRC_PATH)" \ | grep "^$(PRJ_SRC_PATH)" \
| xargs go list -e -f '{{.Dir}} {{.Dir}}/*.go'); \ | xargs go list -e -f '{{.Dir}} {{.Dir}}/*.go'); \
echo $$DIRECT $$INDIRECT | sed 's/ / \\\n\t/g'; \ echo $$DIRECT $$INDIRECT | sed 's/ / =,/g' | tr '=,' '\n\t'; \
) | sed "s|$$(pwd -P)/||" > $@.tmp; \ ) | sed "s|$$(pwd -P)/||" > $@.tmp; \
cmp -s $@.tmp $@ || cat $@.tmp > $@ && rm -f $@.tmp cmp -s $@.tmp $@ || cat $@.tmp > $@ && rm -f $@.tmp
......
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