From 799c22f63b93e9d1ab8f01473bf9ebd2e9750f43 Mon Sep 17 00:00:00 2001
From: Roman Perepelitsa <roman.perepelitsa@gmail.com>
Date: Sun, 25 Jul 2021 09:31:56 +0200
Subject: [PATCH] Squashed 'gitstatus/' changes from 1edd9e62..845f492f

845f492f build: target march armv8-a instead of armv8
cf21109b build: respect CXX environment variable

git-subtree-dir: gitstatus
git-subtree-split: 845f492f777af84e50b9a4820c7b08729c841f0c
---
 build | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/build b/build
index d3e96d74..8f0892f2 100755
--- a/build
+++ b/build
@@ -339,7 +339,7 @@ command make -j "$cpus" VERBOSE=1
 
 APPNAME="$appname".tmp           \
   OBJDIR="$workdir"/gitstatus    \
-  CXX="$gitstatus_cxx"           \
+  CXX="${CXX:-$gitstatus_cxx}"   \
   CXXFLAGS="$gitstatus_cxxflags" \
   LDFLAGS="$gitstatus_ldflags"   \
   LDLIBS="$gitstatus_ldlibs"     \
@@ -487,8 +487,7 @@ if [ -z "$gitstatus_cpu" ]; then
     armel)          gitstatus_cpu=armv5;;
     armv6l|armhf)   gitstatus_cpu=armv6;;
     armv7l)         gitstatus_cpu=armv7;;
-    arm64)          gitstatus_cpu=armv8;;
-    aarch64)        gitstatus_cpu=armv8-a;;
+    arm64|aarch64)  gitstatus_cpu=armv8-a;;
     ppc64le)        gitstatus_cpu=powerpc64le;;
     riscv64)        gitstatus_cpu=rv64imafdc;;
     x86_64|amd64)   gitstatus_cpu=x86-64;;