git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #144778 from thiagokokada/zhf-ovmf-i686

OVMF: disable LTO on i686

commitd2c613620d7676d51a030edbc67cc39683a7867b authorThiago Kenji Okada <thiagokokada@gmail.com> dateFri 5 Nov 2021, 20:03 (5 years ago) parent1de16bb571c4e7
1 file changed+5−1
pkgs/applications/virtualization/OVMF/default.nix+5−1
pkgs/applications/virtualization/OVMF/default.nix+5−1
@@ -30,8 +30,12 @@ edk2.mkDerivation projectDscPath {
3030
3131 hardeningDisable = [ "format" "stackprotector" "pic" "fortify" ];
3232
33+ # Fails on i686 with:
34+ # 'cc1: error: LTO support has not been enabled in this configuration'
35+ NIX_CFLAGS_COMPILE = lib.optionals stdenv.isi686 [ "-fno-lto" ];
36+
3337 buildFlags =
34− lib.optional secureBoot "-D SECURE_BOOT_ENABLE=TRUE"
38+ lib.optionals secureBoot [ "-D SECURE_BOOT_ENABLE=TRUE" ]
3539 ++ lib.optionals csmSupport [ "-D CSM_ENABLE" "-D FD_SIZE_2MB" ]
3640 ++ lib.optionals httpSupport [ "-D NETWORK_HTTP_ENABLE=TRUE" "-D NETWORK_HTTP_BOOT_ENABLE=TRUE" ]
3741 ++ lib.optionals tpmSupport [ "-D TPM_ENABLE" "-D TPM2_ENABLE" "-D TPM2_CONFIG_ENABLE"];