diff options
| author | Nick Mathewson <nickm@torproject.org> | 2009-10-14 21:29:40 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2009-10-14 21:29:40 -0400 |
| commit | 5fb6d9ac4b88224787b1e76de2b6e79168968e66 (patch) | |
| tree | eb5f9d8b5870d18864e653a3287f250640cf438e | |
| parent | c152bb3b6b2e7434cac15362e5e156a59b39f672 (diff) | |
| parent | c0ad6909247161a4de00051f2b6611be16eaa8e7 (diff) | |
| download | tor-5fb6d9ac4b88224787b1e76de2b6e79168968e66.tar.gz tor-5fb6d9ac4b88224787b1e76de2b6e79168968e66.zip | |
Merge commit 'phobos/tor-dmg-naming-update'
| -rwxr-xr-x | contrib/osx/Tor | 8 | ||||
| -rw-r--r-- | contrib/osx/package.sh | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/contrib/osx/Tor b/contrib/osx/Tor index 0660fd7c8d..bcddc0c42b 100755 --- a/contrib/osx/Tor +++ b/contrib/osx/Tor @@ -25,9 +25,9 @@ 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.6") ARCH="universal";; - "10.5") ARCH="universal";; - "10.4") ARCH="universal";; + "10.6") ARCH="i386";; + "10.5") ARCH="i386";; + "10.4") ARCH="i386";; "10.3") ARCH="ppc";; "10.2") ARCH="ppc";; "10.1") ARCH="ppc";; @@ -37,7 +37,7 @@ else ARCH="unknown" fi -if [ $ARCH != "universal" ]; then +if [ $ARCH != "i386" ]; then export EVENT_NOKQUEUE=1 fi diff --git a/contrib/osx/package.sh b/contrib/osx/package.sh index eeb0f95078..488bd27c1b 100644 --- a/contrib/osx/package.sh +++ b/contrib/osx/package.sh @@ -34,9 +34,9 @@ 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.6") ARCH="universal";; - "10.5") ARCH="universal";; - "10.4") ARCH="universal";; + "10.6") ARCH="i386";; + "10.5") ARCH="i386";; + "10.4") ARCH="i386";; "10.3") ARCH="ppc";; "10.2") ARCH="ppc";; "10.1") ARCH="ppc";; |