diff options
| author | Roman Perepelitsa <roman.perepelitsa@gmail.com> | 2021-07-25 10:31:56 +0300 |
|---|---|---|
| committer | Roman Perepelitsa <roman.perepelitsa@gmail.com> | 2021-07-25 10:31:56 +0300 |
| commit | 8f798f986a02eb27c4ef25229976443fa2a66809 (patch) | |
| tree | 22f0e9b2bc03a91fe8ae13d6579177e3e73a1688 /gitstatus | |
| parent | e3c8529052bb8c73fdde48a28ed9f6a8b4a4408b (diff) | |
| parent | 799c22f63b93e9d1ab8f01473bf9ebd2e9750f43 (diff) | |
Merge commit '799c22f63b93e9d1ab8f01473bf9ebd2e9750f43'
Diffstat (limited to 'gitstatus')
| -rwxr-xr-x | gitstatus/build | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gitstatus/build b/gitstatus/build index d3e96d74..8f0892f2 100755 --- a/gitstatus/build +++ b/gitstatus/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;; |