Skip to content

Commit b960f04

Browse files
[8.19] (backport #19754) fix: update NOTICE files to reflect binary deps (#19790)
* fix: update NOTICE files to reflect binary deps (#19754) pass CGO_ENABLED to go list do not include windows,darwin tag for fips binary (cherry picked from commit 63f6695) # Conflicts: # NOTICE-fips.txt * lint: make notice --------- Co-authored-by: kruskall <99559985+kruskall@users.noreply.github.com>
1 parent da4802e commit b960f04

File tree

3 files changed

+216
-1259
lines changed

3 files changed

+216
-1259
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,10 +284,10 @@ gofmt: add-headers
284284
##############################################################################
285285

286286
MODULE_DEPS=$(sort $(shell \
287-
go list -deps -tags=darwin,linux,windows -f "{{with .Module}}{{if not .Main}}{{.Path}}{{end}}{{end}}" ./x-pack/apm-server))
287+
CGO_ENABLED=0 go list -deps -tags=darwin,linux,windows -f "{{with .Module}}{{if not .Main}}{{.Path}}{{end}}{{end}}" ./x-pack/apm-server))
288288

289289
MODULE_DEPS_FIPS=$(sort $(shell \
290-
go list -deps -tags=darwin,linux,windows,requirefips -f "{{with .Module}}{{if not .Main}}{{.Path}}{{end}}{{end}}" ./x-pack/apm-server))
290+
CGO_ENABLED=1 go list -deps -tags=linux,requirefips -f "{{with .Module}}{{if not .Main}}{{.Path}}{{end}}{{end}}" ./x-pack/apm-server))
291291

292292
notice: NOTICE.txt NOTICE-fips.txt
293293
NOTICE.txt build/dependencies-$(APM_SERVER_VERSION).csv: go.mod

0 commit comments

Comments
 (0)