Revert "libcap: Add build ldflags to _makenames rule"

This reverts commit c3ddf45d9afaab85d3b7db0dc7bfd1aafb8fde50. The details of what this broke are here: https://bugzilla.kernel.org/show_bug.cgi?id=220691#c2 Signed-off-by: Andrew G. Morgan <morgan@kernel.org>
Do not cross compile mknames.go
2026-01-27 01:44:26 +00:00 · 2025-11-10 18:26:34 -08:00 · 2025-11-10 18:21:52 -08:00
2 changed files with 2 additions and 2 deletions
--- a/go/Makefile
+++ b/go/Makefile
@ -49,7 +49,7 @@ $(topdir)/libcap/cap_names.h:
 	$(MAKE) -C $(topdir)/libcap cap_names.h

 good-names.go: $(topdir)/libcap/cap_names.h vendor/$(IMPORTDIR)/cap mknames.go
-	CC="$(CC)" $(GO) run -mod=vendor mknames.go --header=$< --textdir=$(topdir)/doc/values | gofmt > $@ || rm -f $@
+	CC="$(BUILD_CC)" GOOS= GOARCH= $(GO) run -mod=vendor mknames.go --header=$< --textdir=$(topdir)/doc/values | gofmt > $@ || rm -f $@
 	diff -u ../cap/names.go $@

 PSXGOPACKAGE: vendor/$(IMPORTDIR)/psx ../psx/*.go $(DEPS)
--- a/libcap/Makefile
+++ b/libcap/Makefile
@ -80,7 +80,7 @@ $(PSXTITLE).pc: $(PSXTITLE).pc.in
 		$< >$@

 _makenames: _makenames.c cap_names.list.h
-	$(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@ $(BUILD_LDFLAGS)
+	$(BUILD_CC) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $< -o $@

 cap_names.h: _makenames
 	./_makenames > cap_names.h