| Message ID | 1536733082-19110-1-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | Accepted |
| Commit | 0d91bf584fe55349193afa96a2f36d288f65b218 |
| Headers | show |
| Series | kbuild: remove old check for CFLAGS use | expand |
2018-09-12 15:18 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>: > This check has been here more than a decade since commit 0c53c8e6eb45 > ("kbuild: check for wrong use of CFLAGS"). > > Enough time for migration has passed. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- Applied to linux-kbuild. > scripts/Makefile.build | 10 ---------- > 1 file changed, 10 deletions(-) > > diff --git a/scripts/Makefile.build b/scripts/Makefile.build > index 5a2d1c9..cb03774 100644 > --- a/scripts/Makefile.build > +++ b/scripts/Makefile.build > @@ -36,21 +36,11 @@ subdir-ccflags-y := > > include scripts/Kbuild.include > > -# For backward compatibility check that these variables do not change > -save-cflags := $(CFLAGS) > - > # The filename Kbuild has precedence over Makefile > kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src)) > kbuild-file := $(if $(wildcard $(kbuild-dir)/Kbuild),$(kbuild-dir)/Kbuild,$(kbuild-dir)/Makefile) > include $(kbuild-file) > > -# If the save-* variables changed error out > -ifeq ($(KBUILD_NOPEDANTIC),) > - ifneq ("$(save-cflags)","$(CFLAGS)") > - $(error CFLAGS was changed in "$(kbuild-file)". Fix it to use ccflags-y) > - endif > -endif > - > include scripts/Makefile.lib > > # Do not include host rules unless needed > -- > 2.7.4 > -- Best Regards Masahiro Yamada
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 5a2d1c9..cb03774 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -36,21 +36,11 @@ subdir-ccflags-y := include scripts/Kbuild.include -# For backward compatibility check that these variables do not change -save-cflags := $(CFLAGS) - # The filename Kbuild has precedence over Makefile kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src)) kbuild-file := $(if $(wildcard $(kbuild-dir)/Kbuild),$(kbuild-dir)/Kbuild,$(kbuild-dir)/Makefile) include $(kbuild-file) -# If the save-* variables changed error out -ifeq ($(KBUILD_NOPEDANTIC),) - ifneq ("$(save-cflags)","$(CFLAGS)") - $(error CFLAGS was changed in "$(kbuild-file)". Fix it to use ccflags-y) - endif -endif - include scripts/Makefile.lib # Do not include host rules unless needed
This check has been here more than a decade since commit 0c53c8e6eb45 ("kbuild: check for wrong use of CFLAGS"). Enough time for migration has passed. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- scripts/Makefile.build | 10 ---------- 1 file changed, 10 deletions(-) -- 2.7.4