[GIT PULL] bootconfig: Update for v6.15

[Google]

Hi Linus,

Bootconfig updates for v6.15:

 - Allow overriding CFLAGS for tools/bootconfig
 - Allow overriding LDFLAGS for tools/bootconfig
   Both allow overriding build flags for tools/bootconfig, for
   example making it a static binary.


Please pull the latest bootconfig-v6.16 tree, which can be found at:


  git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
bootconfig-v6.16

Tag SHA1: 0e48955b14e75b5f0c386b2ef4bab92274c522a1
Head SHA1: d81bab116b485643a08f2147165cc257b3734188


Brian Masney (2):
      tools/bootconfig: allow overriding CFLAGS assignment
      tools/bootconfig: specify LDFLAGS as an argument to CC

----
 tools/bootconfig/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---------------------------
diff --git a/tools/bootconfig/Makefile b/tools/bootconfig/Makefile
index 566c3e0ee561..90eb47c9d8de 100644
--- a/tools/bootconfig/Makefile
+++ b/tools/bootconfig/Makefile
@@ -10,7 +10,7 @@ srctree := $(patsubst %/,%,$(dir $(srctree)))
 endif
 
 LIBSRC = $(srctree)/lib/bootconfig.c $(srctree)/include/linux/bootconfig.h
-CFLAGS = -Wall -g -I$(CURDIR)/include
+override CFLAGS += -Wall -g -I$(CURDIR)/include
 
 ALL_TARGETS := bootconfig
 ALL_PROGRAMS := $(patsubst %,$(OUTPUT)%,$(ALL_TARGETS))
@@ -18,7 +18,7 @@ ALL_PROGRAMS := $(patsubst %,$(OUTPUT)%,$(ALL_TARGETS))
 all: $(ALL_PROGRAMS) test
 
 $(OUTPUT)bootconfig: main.c include/linux/bootconfig.h $(LIBSRC)
-	$(CC) $(filter %.c,$^) $(CFLAGS) -o $@
+	$(CC) $(filter %.c,$^) $(CFLAGS) $(LDFLAGS) -o $@
 
 test: $(ALL_PROGRAMS) test-bootconfig.sh
 	./test-bootconfig.sh $(OUTPUT)

-- 
Masami Hiramatsu (Google) <mhiramat@xxxxxxxxxx>