Skip to content

Commit

Permalink
integrity: remove unneeded, broken attempt to add -fshort-wchar
Browse files Browse the repository at this point in the history
I guess commit 15ea0e1 ("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

But, you do not need to fix it.

Commit 8c97023 ("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>
  • Loading branch information
masahir0y committed Oct 5, 2019
1 parent 47346e9 commit 6b190d3
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion security/integrity/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down

0 comments on commit 6b190d3

Please sign in to comment.