Skip to content

Commit 546b1c9

Browse files
committed
Merge tag 'bootconfig-v6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace
Pull bootconfig updates from Masami Hiramatsu: - Allow overriding CFLAGS and LDFLAGS for tools/bootconfig, for example making it a static binary. * tag 'bootconfig-v6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace: tools/bootconfig: specify LDFLAGS as an argument to CC tools/bootconfig: allow overriding CFLAGS assignment
2 parents c8be542 + d81bab1 commit 546b1c9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

tools/bootconfig/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ srctree := $(patsubst %/,%,$(dir $(srctree)))
1010
endif
1111

1212
LIBSRC = $(srctree)/lib/bootconfig.c $(srctree)/include/linux/bootconfig.h
13-
CFLAGS = -Wall -g -I$(CURDIR)/include
13+
override CFLAGS += -Wall -g -I$(CURDIR)/include
1414

1515
ALL_TARGETS := bootconfig
1616
ALL_PROGRAMS := $(patsubst %,$(OUTPUT)%,$(ALL_TARGETS))
1717

1818
all: $(ALL_PROGRAMS) test
1919

2020
$(OUTPUT)bootconfig: main.c include/linux/bootconfig.h $(LIBSRC)
21-
$(CC) $(filter %.c,$^) $(CFLAGS) -o $@
21+
$(CC) $(filter %.c,$^) $(CFLAGS) $(LDFLAGS) -o $@
2222

2323
test: $(ALL_PROGRAMS) test-bootconfig.sh
2424
./test-bootconfig.sh $(OUTPUT)

0 commit comments

Comments
 (0)