From 0d1aa38232e35ed8d72f552cf3fb2b2b2c68abe9 Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Sun, 13 Sep 2020 22:16:06 +0300
Subject: [PATCH] grub: correctly strip -march=native

Turns out grub also uses CXXFLAGS.
---
 core/grub/build | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/grub/build b/core/grub/build
index 7ade5684..715a4c2a 100755
--- a/core/grub/build
+++ b/core/grub/build
@@ -12,7 +12,8 @@ sed -i 's/mv $@.new $@/:/g' ./*/Makefile.in
 
 # Strip '-march' from 'CFLAGS' as per advice from upstream.
 # Fixes build fails on specific hardware.
-CFLAGS=$(printf %s "$CFLAGS" | sed 's/-march=[^ ]*//g')
+CFLAGS=$(printf %s "$CFLAGS"   | sed 's/-march=[^ ]*//g')
+CFLAGS=$(printf %s "$CXXFLAGS" | sed 's/-march=[^ ]*//g')
 
 # Grub is built in a function so the script argument
 # needs to be stored.