| Message ID | 20190726021058.4212-2-yamada.masahiro@socionext.com |
|---|---|
| State | Accepted |
| Commit | 6b190d3ce0a693750517256ba67011a9fa04a12a |
| Headers | show |
| Series | security: integrity: Makefile cleanups | expand |
On Fri, Jul 26, 2019 at 11:11 AM Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > > I guess commit 15ea0e1e3e18 ("efi: Import certificates from UEFI Secure > Boot") attempted to add -fshort-wchar for building load_uefi.o, but it > has never worked as intended. > > load_uefi.o is created in the platform_certs/ sub-directory. If you > really want to add -fshort-wchar, the correct code is: > > $(obj)/platform_certs/load_uefi.o: KBUILD_CFLAGS += -fshort-wchar > > or, in a more Kbuild-ish way: > > CFLAGS_load_uefi.o := -fshort-wchar > > But, you do not need to fix it. > > Commit 8c97023cf051 ("Kbuild: use -fshort-wchar globally") had already > added -fshort-wchar globally. This code was unneeded in the first place. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- Ping. > > security/integrity/Makefile | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/security/integrity/Makefile b/security/integrity/Makefile > index 19faace69644..b6d6273a4176 100644 > --- a/security/integrity/Makefile > +++ b/security/integrity/Makefile > @@ -13,7 +13,6 @@ integrity-$(CONFIG_INTEGRITY_PLATFORM_KEYRING) += platform_certs/platform_keyrin > integrity-$(CONFIG_LOAD_UEFI_KEYS) += platform_certs/efi_parser.o \ > platform_certs/load_uefi.o > integrity-$(CONFIG_LOAD_IPL_KEYS) += platform_certs/load_ipl_s390.o > -$(obj)/load_uefi.o: KBUILD_CFLAGS += -fshort-wchar > > subdir-$(CONFIG_IMA) += ima > obj-$(CONFIG_IMA) += ima/ > -- > 2.17.1 > -- Best Regards Masahiro Yamada
diff --git a/security/integrity/Makefile b/security/integrity/Makefile index 19faace69644..b6d6273a4176 100644 --- a/security/integrity/Makefile +++ b/security/integrity/Makefile @@ -13,7 +13,6 @@ integrity-$(CONFIG_INTEGRITY_PLATFORM_KEYRING) += platform_certs/platform_keyrin integrity-$(CONFIG_LOAD_UEFI_KEYS) += platform_certs/efi_parser.o \ platform_certs/load_uefi.o integrity-$(CONFIG_LOAD_IPL_KEYS) += platform_certs/load_ipl_s390.o -$(obj)/load_uefi.o: KBUILD_CFLAGS += -fshort-wchar subdir-$(CONFIG_IMA) += ima obj-$(CONFIG_IMA) += ima/
I guess commit 15ea0e1e3e18 ("efi: Import certificates from UEFI Secure Boot") attempted to add -fshort-wchar for building load_uefi.o, but it has never worked as intended. load_uefi.o is created in the platform_certs/ sub-directory. If you really want to add -fshort-wchar, the correct code is: $(obj)/platform_certs/load_uefi.o: KBUILD_CFLAGS += -fshort-wchar or, in a more Kbuild-ish way: CFLAGS_load_uefi.o := -fshort-wchar But, you do not need to fix it. Commit 8c97023cf051 ("Kbuild: use -fshort-wchar globally") had already added -fshort-wchar globally. This code was unneeded in the first place. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- security/integrity/Makefile | 1 - 1 file changed, 1 deletion(-) -- 2.17.1