diff options
| -rwxr-xr-x | tools/linux_packaging/stage2.run.in | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/tools/linux_packaging/stage2.run.in b/tools/linux_packaging/stage2.run.in index 75f48cc170..29955ffe4e 100755 --- a/tools/linux_packaging/stage2.run.in +++ b/tools/linux_packaging/stage2.run.in @@ -221,6 +221,16 @@ case `uname -m` in echo "Architecture is x86_64" ARCH='x86_64' ;; + arm|armv7l|aarch32) + echo "Architecture is armhf" + ARCH='armhf' + NOABICHECK=1 + ;;; + aarch64|armv8b) + echo "Architecture is arm64" + ARCH='arm64' + NOABICHECK=1 + ;; *) echo "" echo "!!! ERROR !!! - Unknown architecture `uname -m`" @@ -314,11 +324,11 @@ else fi fi -############################# -# Determine C11 stdlibc++ ABI -############################# +############################### +# Determine C++11 stdlibc++ ABI +############################### -if test -z "$ABI"; then +if test -z "$ABI" -a -z "$NOABICHECK"; then if %REPLACE_GCC5%; then # Ardour was compiled with gcc5, warn on gcc4 systems if ! "${PKG_PATH}/.gcc-glibmm-abi-check" --gcc5; then |