diff options
author | Andrew G. Morgan <morgan@kernel.org> | 2022-07-21 11:52:47 -0700 |
---|---|---|
committer | Andrew G. Morgan <morgan@kernel.org> | 2022-07-21 11:52:47 -0700 |
commit | 27e801bcbcffadd8a9e3193f0c520b1f08535574 (patch) | |
tree | a57fee5b590eb5f0ca23e8474529a893fa690921 | |
parent | a47d86dfb9bfb56968b7d5469471ea317a12379c (diff) | |
download | libcap-27e801bcbcffadd8a9e3193f0c520b1f08535574.tar.gz |
Fix for "make clean ; make -j48 test"
Missed a vendor dependency for the ok.go file. More recent go releases
seem more picky about module or vendoring being used, and for the in-tree
builds we consistently use vendoring. So make sure the vendoring
directory set up has completed before trying to build ok.go.
The failure was reported by Tomasz Kłoczko.
Signed-off-by: Andrew G. Morgan <morgan@kernel.org>
-rw-r--r-- | go/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/go/Makefile b/go/Makefile index f6390da..342d93f 100644 --- a/go/Makefile +++ b/go/Makefile @@ -74,8 +74,8 @@ gowns: ../goapps/gowns/gowns.go CAPGOPACKAGE captree: ../goapps/captree/captree.go CAPGOPACKAGE CC="$(CC)" CGO_ENABLED="$(CGO_REQUIRED)" $(CGO_LDFLAGS_ALLOW) $(GO) build $(GO_BUILD_FLAGS) -mod=vendor -o $@ $< -ok: ok.go - CC="$(CC)" CGO_ENABLED="0" $(GO) build $(GO_BUILD_FLAGS) -mod=vendor $< +ok: ok.go vendor/modules.txt + CC="$(CC)" CGO_ENABLED="0" $(GO) build $(GO_BUILD_FLAGS) -mod=vendor $< try-launching: try-launching.go CAPGOPACKAGE ok CC="$(CC)" CGO_ENABLED="$(CGO_REQUIRED)" $(CGO_LDFLAGS_ALLOW) $(GO) build $(GO_BUILD_FLAGS) -mod=vendor $< |