From db956ebd6ec994674645cb88d2dfc819d7da2cd6 Mon Sep 17 00:00:00 2001 From: su_v Date: Sun, 14 Sep 2014 22:15:13 +0200 Subject: fix flawed test for cpu capability (r13600) (bzr r13506.1.95) --- packaging/macosx/osx-app.sh | 3 +-- packaging/macosx/osx-build.sh | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'packaging') diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 8318f9761..9a3478e67 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -282,8 +282,7 @@ ARCH="$(uname -a | awk '{print $NF;}')" # guess default build_arch (MacPorts) if [ "$OSXMINORNO" -ge "6" ]; then - _cpu_bits="$(sysctl hw.cpu64bit_capable > /dev/null 2>&1)" - if [ $? -eq 0 ]; then + if [ "$(sysctl hw.cpu64bit_capable 2>/dev/null | awk '{print $NF;}')" = "1" ]; then _build_arch="x86_64" else _build_arch="i386" diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh index 84a0d0ba9..ececf11cb 100755 --- a/packaging/macosx/osx-build.sh +++ b/packaging/macosx/osx-build.sh @@ -174,8 +174,7 @@ ARCH="$(uname -a | awk '{print $NF;}')" # guess default build_arch (MacPorts) if [ "$OSXMINORNO" -ge "6" ]; then - _cpu_bits="$(sysctl hw.cpu64bit_capable > /dev/null 2>&1)" - if [ $? -eq 0 ]; then + if [ "$(sysctl hw.cpu64bit_capable 2>/dev/null | awk '{print $NF;}')" = "1" ]; then _build_arch="x86_64" else _build_arch="i386" -- cgit v1.2.3