summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Lewman <andrew@torproject.org>2006-10-05 03:25:48 +0000
committerAndrew Lewman <andrew@torproject.org>2006-10-05 03:25:48 +0000
commit994fce6c0a88854a54e1c0f8de2f3bb61d70446f (patch)
tree694d85fabc3180bbb6fb3ebcca175765f8a67ad4
parent4e6dbf96cea26d37801c4cbf2aa83f6ed588c905 (diff)
downloadtor-994fce6c0a88854a54e1c0f8de2f3bb61d70446f.tar.gz
tor-994fce6c0a88854a54e1c0f8de2f3bb61d70446f.zip
ARCH is universal for OSX 10.4 and beyond. Only ppc is available for
10.3 and previous. svn:r8596
-rw-r--r--contrib/osx/package.sh18
1 files changed, 6 insertions, 12 deletions
diff --git a/contrib/osx/package.sh b/contrib/osx/package.sh
index d63c3efab4..ef6785749d 100644
--- a/contrib/osx/package.sh
+++ b/contrib/osx/package.sh
@@ -32,12 +32,6 @@ if [ "XX$VERSION" = 'XX' ]; then
exit 1
fi
-if [ -x /usr/bin/arch ]; then
- ARCH=`/usr/bin/arch`
-else
- ARCH="unknown"
-fi
-
## Determine OSX Version
# map version to name
if [ -x /usr/bin/sw_vers ]; then
@@ -45,12 +39,12 @@ if [ -x /usr/bin/sw_vers ]; then
# the OS version
OSVER=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 | cut -d"." -f1,2`
case "$OSVER" in
- "10.5") OS="leopard";;
- "10.4") OS="tiger";;
- "10.3") OS="panther";;
- "10.2") OS="jaguar";;
- "10.1") OS="puma";;
- "10.0") OS="cheetah";;
+ "10.5") OS="leopard" ARCH="universal";;
+ "10.4") OS="tiger" ARCH="universal";;
+ "10.3") OS="panther" ARCH="ppc";;
+ "10.2") OS="jaguar" ARCH="ppc";;
+ "10.1") OS="puma" ARCH="ppc";;
+ "10.0") OS="cheetah" ARCH="ppc";;
*) OS="unknown";;
esac
else