diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2009-04-19 05:04:26 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@ravnborg.org> | 2009-04-19 05:12:12 -0400 |
commit | 720097d895956c0bf15b8440f7845159a04b74da (patch) | |
tree | 25e5546b16c86a23bd69b5b65b8b33f1d70540b6 /scripts | |
parent | f14875a3e0cc35d7dbe15ee39763a6ae922e7034 (diff) |
kbuild: introduce subdir-ccflags-y
Following patch introduce support for setting options
to gcc that has effect for current directory and all
subdirectories.
The typical use case are an architecture or a subsystem that
decide to cover all files with -Werror.
Today alpha, mips and sparc uses -Werror in almost all their
Makefile- with subdir-ccflag-y it is now simpler to do so
as only the top-level directories needs to be covered.
Likewise if we decide to cover a full subsystem such
as net/ with -Werror this is done by adding a single
line to net/Makefile.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/Makefile.build | 3 | ||||
-rw-r--r-- | scripts/Makefile.lib | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 39a9642927d3..5c4b7a400c18 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build | |||
@@ -27,6 +27,9 @@ ccflags-y := | |||
27 | cppflags-y := | 27 | cppflags-y := |
28 | ldflags-y := | 28 | ldflags-y := |
29 | 29 | ||
30 | subdir-asflags-y := | ||
31 | subdir-ccflags-y := | ||
32 | |||
30 | # Read auto.conf if it exists, otherwise ignore | 33 | # Read auto.conf if it exists, otherwise ignore |
31 | -include include/config/auto.conf | 34 | -include include/config/auto.conf |
32 | 35 | ||
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 979619574f70..cba61ca403ca 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib | |||
@@ -4,6 +4,11 @@ ccflags-y += $(EXTRA_CFLAGS) | |||
4 | cppflags-y += $(EXTRA_CPPFLAGS) | 4 | cppflags-y += $(EXTRA_CPPFLAGS) |
5 | ldflags-y += $(EXTRA_LDFLAGS) | 5 | ldflags-y += $(EXTRA_LDFLAGS) |
6 | 6 | ||
7 | # | ||
8 | # flags that take effect in sub directories | ||
9 | export KBUILD_SUBDIR_ASFLAGS := $(KBUILD_SUBDIR_ASFLAGS) $(subdir-asflags-y) | ||
10 | export KBUILD_SUBDIR_CCFLAGS := $(KBUILD_SUBDIR_CCFLAGS) $(subdir-ccflags-y) | ||
11 | |||
7 | # Figure out what we need to build from the various variables | 12 | # Figure out what we need to build from the various variables |
8 | # =========================================================================== | 13 | # =========================================================================== |
9 | 14 | ||
@@ -104,10 +109,10 @@ else | |||
104 | debug_flags = | 109 | debug_flags = |
105 | endif | 110 | endif |
106 | 111 | ||
107 | orig_c_flags = $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) \ | 112 | orig_c_flags = $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(KBUILD_SUBDIR_CCFLAGS) \ |
108 | $(ccflags-y) $(CFLAGS_$(basetarget).o) | 113 | $(ccflags-y) $(CFLAGS_$(basetarget).o) |
109 | _c_flags = $(filter-out $(CFLAGS_REMOVE_$(basetarget).o), $(orig_c_flags)) | 114 | _c_flags = $(filter-out $(CFLAGS_REMOVE_$(basetarget).o), $(orig_c_flags)) |
110 | _a_flags = $(KBUILD_CPPFLAGS) $(KBUILD_AFLAGS) \ | 115 | _a_flags = $(KBUILD_CPPFLAGS) $(KBUILD_AFLAGS) $(KBUILD_SUBDIR_ASFLAGS) \ |
111 | $(asflags-y) $(AFLAGS_$(basetarget).o) | 116 | $(asflags-y) $(AFLAGS_$(basetarget).o) |
112 | _cpp_flags = $(KBUILD_CPPFLAGS) $(cppflags-y) $(CPPFLAGS_$(@F)) | 117 | _cpp_flags = $(KBUILD_CPPFLAGS) $(cppflags-y) $(CPPFLAGS_$(@F)) |
113 | 118 | ||