From: Jan Janssen <medhefgo@web.de>
Date: Sun, 1 Oct 2023 07:55:48 +0000 (+0200)
Subject: meson: Pass all -static-pie args to linker
X-Git-Tag: v255-rc1~373
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8b53f4f1558b17169809effd865232580e4c4af;p=thirdparty%2Fsystemd.git

meson: Pass all -static-pie args to linker

Fixes: #29381
---

diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build
index d168d2d553d..d5c10258044 100644
--- a/src/boot/efi/meson.build
+++ b/src/boot/efi/meson.build
@@ -153,9 +153,14 @@ efi_c_ld_args = [
         '-Wl,--entry=efi_main',
         '-Wl,--fatal-warnings',
 
-        # These flags should be passed by -static-pie, but seem to be missing sometimes.
-        '-Wl,--no-dynamic-linker',
-        '-z', 'text',
+        # These flags should be passed by -static-pie, but for whatever reason the flag translation
+        # is not enabled on all architectures. Not passing `-static` would just allow the linker to
+        # use dynamic libraries, (which we can't/don't use anyway). But if `-pie` is missing and the
+        # gcc build does not default to `-pie` we get a regular (no-pie) binary that will be
+        # rightfully rejected by elf2efi. Note that meson also passes `-pie` to the linker driver,
+        # but it is overridden by our `-static-pie`. We also need to pass these directly to the
+        # linker as `-static`+`-pie` seem to get translated differently.
+        '-Wl,-static,-pie,--no-dynamic-linker,-z,text',
 
         # EFI has 4KiB pages.
         '-z', 'common-page-size=4096',