diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-08-23 19:20:39 -0400 |
---|---|---|
committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-08-23 19:22:08 -0400 |
commit | d503ac531a5246e4d910f971b213807fea925956 (patch) | |
tree | 25e07f13512496598b959eefc238f169aaba9e59 /Makefile | |
parent | 87a32e624037e8b6e8538ed864dc9994853acc4d (diff) |
kbuild: rename LDFLAGS to KBUILD_LDFLAGS
Commit a0f97e06a43c ("kbuild: enable 'make CFLAGS=...' to add
additional options to CC") renamed CFLAGS to KBUILD_CFLAGS.
Commit 222d394d30e7 ("kbuild: enable 'make AFLAGS=...' to add
additional options to AS") renamed AFLAGS to KBUILD_AFLAGS.
Commit 06c5040cdb13 ("kbuild: enable 'make CPPFLAGS=...' to add
additional options to CPP") renamed CPPFLAGS to KBUILD_CPPFLAGS.
For some reason, LDFLAGS was not renamed.
Using a well-known variable like LDFLAGS may result in accidental
override of the variable.
Kbuild generally uses KBUILD_ prefixed variables for the internally
appended options, so here is one more conversion to sanitize the
naming convention.
I did not touch Makefiles under tools/ since the tools build system
is a different world.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Reviewed-by: Palmer Dabbelt <palmer@sifive.com>
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -440,7 +440,7 @@ KBUILD_CFLAGS_KERNEL := | |||
440 | KBUILD_AFLAGS_MODULE := -DMODULE | 440 | KBUILD_AFLAGS_MODULE := -DMODULE |
441 | KBUILD_CFLAGS_MODULE := -DMODULE | 441 | KBUILD_CFLAGS_MODULE := -DMODULE |
442 | KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds | 442 | KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds |
443 | LDFLAGS := | 443 | KBUILD_LDFLAGS := |
444 | GCC_PLUGINS_CFLAGS := | 444 | GCC_PLUGINS_CFLAGS := |
445 | 445 | ||
446 | export ARCH SRCARCH CONFIG_SHELL HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE AS LD CC | 446 | export ARCH SRCARCH CONFIG_SHELL HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE AS LD CC |
@@ -448,7 +448,7 @@ export CPP AR NM STRIP OBJCOPY OBJDUMP KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS | |||
448 | export MAKE LEX YACC AWK GENKSYMS INSTALLKERNEL PERL PYTHON PYTHON2 PYTHON3 UTS_MACHINE | 448 | export MAKE LEX YACC AWK GENKSYMS INSTALLKERNEL PERL PYTHON PYTHON2 PYTHON3 UTS_MACHINE |
449 | export HOSTCXX KBUILD_HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS | 449 | export HOSTCXX KBUILD_HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS |
450 | 450 | ||
451 | export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS | 451 | export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS KBUILD_LDFLAGS |
452 | export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE | 452 | export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE |
453 | export CFLAGS_KASAN CFLAGS_KASAN_NOSANITIZE CFLAGS_UBSAN | 453 | export CFLAGS_KASAN CFLAGS_KASAN_NOSANITIZE CFLAGS_UBSAN |
454 | export KBUILD_AFLAGS AFLAGS_KERNEL AFLAGS_MODULE | 454 | export KBUILD_AFLAGS AFLAGS_KERNEL AFLAGS_MODULE |
@@ -1020,7 +1020,7 @@ ARCH_POSTLINK := $(wildcard $(srctree)/arch/$(SRCARCH)/Makefile.postlink) | |||
1020 | 1020 | ||
1021 | # Final link of vmlinux with optional arch pass after final link | 1021 | # Final link of vmlinux with optional arch pass after final link |
1022 | cmd_link-vmlinux = \ | 1022 | cmd_link-vmlinux = \ |
1023 | $(CONFIG_SHELL) $< $(LD) $(LDFLAGS) $(LDFLAGS_vmlinux) ; \ | 1023 | $(CONFIG_SHELL) $< $(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_vmlinux) ; \ |
1024 | $(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true) | 1024 | $(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) $@, true) |
1025 | 1025 | ||
1026 | vmlinux: scripts/link-vmlinux.sh autoksyms_recursive $(vmlinux-deps) FORCE | 1026 | vmlinux: scripts/link-vmlinux.sh autoksyms_recursive $(vmlinux-deps) FORCE |