[tor-commits] [tor-browser/tor-browser-31.2.0esr-4.5-1] Changes needed to build Mac in 64bit

[mikeperry at torproject.org]

commit b8b6d86a5b6407b9e0f42bfe1de188e5be49b47d
Author: Tom Ritter <tom at ritter.vg>
Date:   Tue Sep 16 08:10:50 2014 -0500

    Changes needed to build Mac in 64bit
---
 .mozconfig-mac                   |    4 ++--
 toolkit/library/dependentlibs.py |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.mozconfig-mac b/.mozconfig-mac
index 4abcc7c..2c06c34 100644
--- a/.mozconfig-mac
+++ b/.mozconfig-mac
@@ -2,7 +2,7 @@ export CROSS_COMPILE=1
 
 SYSROOTDIR=/usr/lib/apple/SDKs/MacOSX10.6.sdk
 ROOTDIR="$HOME/build/x-tools/x86_64-apple-darwin10/bin"
-FLAGS="-arch i386 -isysroot $SYSROOTDIR"
+FLAGS="-arch x86_64 -isysroot $SYSROOTDIR"
 
 # Ideally we use the patch provided in
 # https://bugzilla.mozilla.org/show_bug.cgi?id=933071 to get rid of our path
@@ -26,7 +26,7 @@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser"
 mk_add_options MOZILLA_OFFICIAL=1
 mk_add_options BUILD_OFFICIAL=1
 
-ac_add_options --target=i386-apple-darwin10
+ac_add_options --target=x86_64-apple-darwin10
 ac_add_options --enable-application=browser
 ac_add_options --enable-strip
 ac_add_options --enable-official-branding
diff --git a/toolkit/library/dependentlibs.py b/toolkit/library/dependentlibs.py
index 43433a1b..4331cfa 100644
--- a/toolkit/library/dependentlibs.py
+++ b/toolkit/library/dependentlibs.py
@@ -71,7 +71,7 @@ def dependentlibs_readelf(lib):
 
 def dependentlibs_otool(lib):
     '''Returns the list of dependencies declared in the given MACH-O dylib'''
-    proc = subprocess.Popen(['otool', '-l', lib], stdout = subprocess.PIPE)
+    proc = subprocess.Popen(["../../../../x-tools/x86_64-apple-darwin10/bin/" + TOOLCHAIN_PREFIX + 'otool', '-l', lib], stdout = subprocess.PIPE)
     deps= []
     cmd = None
     for line in proc.stdout: