[bug#49244] [PATCH] gnu: grub-efi: Only enable the stack protector on x86_64-linux.

[bug#49244] [PATCH] gnu: grub-efi: Only enable the stack protector on x86_64-linux.

[Christopher Baines]

Follow up to 018f95094153660e3041ec160718f0bda286a3dc, as gcc on aarch64-linux
doesn't seem to support -mstack-protector-guard=global.

* gnu/packages/bootloaders.scm (grub-efi)[arguments]: Only add
"--enable-stack-protector" to #:configure-flags when system is x86_64-linux.
---
 gnu/packages/bootloaders.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index e83f21ea63..1ff0348ac7 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -303,7 +303,10 @@ menu to select one of the installed operating systems.")
            ((#:tests? _ #f) #f)
            ((#:configure-flags flags ''())
             `(cons* "--with-platform=efi"
-                    "--enable-stack-protector" ; EFI-only for now
+                    ,@(if (string=? (%current-system)
+                                    "x86_64-linux")
+                          '("--enable-stack-protector") ; EFI-only for now
+                          '())
                     ,flags))
            ((#:phases phases)
             `(modify-phases ,phases
-- 
2.32.0

[bug#49244] [PATCH] gnu: grub-efi: Only enable the stack protector on x86_64-linux.

[Mathieu Othacehe]

Hey Chris,

> +                    ,@(if (string=? (%current-system)
> +                                    "x86_64-linux")
> +                          '("--enable-stack-protector") ; EFI-only for now
> +                          '())

Maybe we should also avoid this option when cross-compiling? Otherwise
it looks OK.

Thanks,

Mathieu

[bug#49244] [PATCH] gnu: grub-efi: Only enable the stack protector on x86_64-linux.

[Maxime Devos]

[-- Attachment #1: Type: text/plain, Size: 556 bytes --]

Mathieu Othacehe schreef op di 29-06-2021 om 17:36 [+0200]:
> Hey Chris,
> 
> > +                    ,@(if (string=? (%current-system)
> > +                                    "x86_64-linux")
> > +                          '("--enable-stack-protector") ; EFI-only for now
> > +                          '())
> 
> Maybe we should also avoid this option when cross-compiling? Otherwise
> it looks OK.

Or rather,
(string-prefix? (or (%current-target-system) (%current-system)) "x86_64")
(or was it the other way around)?

Greetings,
Maxime.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

bug#49244: [PATCH] gnu: grub-efi: Only enable the stack protector on x86_64-linux.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 602 bytes --]


Mathieu Othacehe <othacehe@gnu.org> writes:

> Hey Chris,
>
>> +                    ,@(if (string=? (%current-system)
>> +                                    "x86_64-linux")
>> +                          '("--enable-stack-protector") ; EFI-only for now
>> +                          '())
>
> Maybe we should also avoid this option when cross-compiling? Otherwise
> it looks OK.

Yeah, I was trying to test the cross-compiling case, but I think
something else fails regardless. Anyway, I've pushed something similar
to what Maxime suggested as fd549750d9ab23a0505aeb4c03e1299e860a4f16.

Thanks,

CHris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]