From 1c89832fd5cb1c3be4a5bb9b483e219b06db0f25 Mon Sep 17 00:00:00 2001 From: Lucas Ransan Date: Mon, 21 Dec 2020 18:53:01 +0100 Subject: [PATCH] refind: fix build on gcc10 --- .../0001-Fix-GCC-10-compile-problem.patch | 25 +++++++++++++++++++ pkgs/tools/bootloaders/refind/default.nix | 1 + 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/bootloaders/refind/0001-Fix-GCC-10-compile-problem.patch diff --git a/pkgs/tools/bootloaders/refind/0001-Fix-GCC-10-compile-problem.patch b/pkgs/tools/bootloaders/refind/0001-Fix-GCC-10-compile-problem.patch new file mode 100644 index 00000000000..90b60235aad --- /dev/null +++ b/pkgs/tools/bootloaders/refind/0001-Fix-GCC-10-compile-problem.patch @@ -0,0 +1,25 @@ +From e34a16301f425f273a67ed3abbc45840bc82d892 Mon Sep 17 00:00:00 2001 +From: srs5694 +Date: Fri, 15 May 2020 12:34:14 -0400 +Subject: [PATCH] Fix GCC 10 compile problem + +--- + Make.common | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Make.common b/Make.common +index 3f0b919..95a3a97 100644 +--- a/Make.common ++++ b/Make.common +@@ -60,7 +60,7 @@ endif + # + + # ...for both GNU-EFI and TianoCore.... +-OPTIMFLAGS = -Os -fno-strict-aliasing ++OPTIMFLAGS = -Os -fno-strict-aliasing -fno-tree-loop-distribute-patterns + CFLAGS = $(OPTIMFLAGS) -fno-stack-protector -fshort-wchar -Wall + + # ...for GNU-EFI.... +-- +2.29.2 + diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index 5c7c68d9d9e..76786c26d81 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { patches = [ ./0001-toolchain.patch + ./0001-Fix-GCC-10-compile-problem.patch ]; buildInputs = [ gnu-efi ];