Update bpf2go and stringer go:generate statements across the codebase #1140
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This would pick an old, incompatible version from my GOBIN instead. Signed-off-by: Timo Beckers <timo@isovalent.com>
…rate This patch removes the -cc and -cflags from all 'go:generate' statements across the codebase. Instead, ambiently provide BPF2GO_ env vars to the 'make' call in container-all. This allows running `go generate ./...` on distributions where clang binaries don't have their version numbers suffixed. Signed-off-by: Timo Beckers <timo@isovalent.com>
lmb
reviewed
Sep 28, 2023
| @@ -81,9 +81,6 @@ all: format $(addsuffix -el.elf,$(TARGETS)) $(addsuffix -eb.elf,$(TARGETS)) gene | |||
| ln -srf testdata/loader-$(CLANG)-el.elf testdata/loader-el.elf | |||
| ln -srf testdata/loader-$(CLANG)-eb.elf testdata/loader-eb.elf | |||
|
|
|||
| # $BPF_CLANG is used in go:generate invocations. | |||
| generate: export BPF_CLANG := $(CLANG) | |||
There was a problem hiding this comment.
Doesn't this break make generate outside of container?
There was a problem hiding this comment.
Not for me, it defaults to clang and llvm-strip. I also sent a patch that removed a hardcoded clang-14 somewhere.
lmb
reviewed
Sep 28, 2023
| @@ -1,6 +1,6 @@ | |||
| package asm | |||
|
|
|||
| //go:generate stringer -output alu_string.go -type=Source,Endianness,ALUOp | |||
| //go:generate go run golang.org/x/tools/cmd/stringer@latest -output alu_string.go -type=Source,Endianness,ALUOp | |||
There was a problem hiding this comment.
How does this work without adding a dependency on stringer to go.mod?
There was a problem hiding this comment.
The version is explicitly mentioned, so I assume that's all it needs to know. It doesn't add anything to go.mod/sum.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#1047 added env support to bpf2go, so use it.
Also cleaned up the stringer statements that would otherwise pick an old version from my GOBIN.