From: Jan Janssen Date: Mon, 29 Nov 2021 13:27:48 +0000 (+0100) Subject: sd-boot: Let compiler figure out libgcc location X-Git-Tag: v250-rc1~39^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e3bcb02d2b20a9f3ed4fac6b337815807d616c4;p=thirdparty%2Fsystemd.git sd-boot: Let compiler figure out libgcc location Since we now let the compiler call the linker for us, we can just rely on it to find the right (static) libgcc to use. --- diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build index b8001d1c65f..4460af61f8e 100644 --- a/src/boot/efi/meson.build +++ b/src/boot/efi/meson.build @@ -314,7 +314,6 @@ foreach file : fundamental_source_paths + common_sources + systemd_boot_sources endif endforeach -libgcc_file_name = run_command(efi_cc + ['-print-libgcc-file-name']).stdout().strip() systemd_boot_efi_name = 'systemd-boot@0@.efi'.format(efi_arch[0]) stub_elf_name = 'linux@0@.elf.stub'.format(efi_arch[0]) stub_efi_name = 'linux@0@.efi.stub'.format(efi_arch[0]) @@ -326,7 +325,7 @@ foreach tuple : [['systemd_boot.so', systemd_boot_efi_name, systemd_boot_objects tuple[0], input : tuple[2], output : tuple[0], - command : [efi_cc, '-o', '@OUTPUT@', efi_ldflags, tuple[2], '-lefi', '-lgnuefi', libgcc_file_name], + command : [efi_cc, '-o', '@OUTPUT@', efi_ldflags, tuple[2], '-lefi', '-lgnuefi', '-lgcc'], install : tuple[3], install_dir : bootlibdir)