Skip to content

Commit 6b190d3

Browse files
committed
integrity: remove unneeded, broken attempt to add -fshort-wchar
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 <[email protected]>
1 parent 47346e9 commit 6b190d3

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

security/integrity/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ integrity-$(CONFIG_INTEGRITY_PLATFORM_KEYRING) += platform_certs/platform_keyrin
1313
integrity-$(CONFIG_LOAD_UEFI_KEYS) += platform_certs/efi_parser.o \
1414
platform_certs/load_uefi.o
1515
integrity-$(CONFIG_LOAD_IPL_KEYS) += platform_certs/load_ipl_s390.o
16-
$(obj)/load_uefi.o: KBUILD_CFLAGS += -fshort-wchar
1716

1817
subdir-$(CONFIG_IMA) += ima
1918
obj-$(CONFIG_IMA) += ima/

0 commit comments

Comments
 (0)