Bug 1300380 - Fix autospider on osx. r=terrence
authorTooru Fujisawa <arai_a@mac.com>
Tue, 27 Sep 2016 10:42:13 +0900
changeset 315313 2a5b15755b6e4c61b584c0dc5949481713f297ef
parent 315312 aeab17249ad8c722544490d1afb54bb0630e24ba
child 315314 74aff44c528af7a3ee1d4a35eb447f36e3e1520f
push id30747
push usercbook@mozilla.com
push dateTue, 27 Sep 2016 09:22:00 +0000
treeherdermozilla-central@66a77b9bfe5d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersterrence
bugs1300380
milestone52.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1300380 - Fix autospider on osx. r=terrence
js/src/devtools/automation/autospider.py
js/src/devtools/automation/macbuildenv.sh
--- a/js/src/devtools/automation/autospider.py
+++ b/js/src/devtools/automation/autospider.py
@@ -174,16 +174,17 @@ if os.path.exists(os.path.join(compiler_
     env.setdefault('CXX', os.path.join(compiler_dir, 'bin', cxx))
     platlib = 'lib64' if word_bits == 64 else 'lib'
     env.setdefault('LD_LIBRARY_PATH', os.path.join(compiler_dir, platlib))
 else:
     env.setdefault('CC', compiler)
     env.setdefault('CXX', cxx)
 
 if platform.system() == 'Darwin':
+    os.environ['SOURCE'] = DIR.source
     set_vars_from_script(os.path.join(DIR.scripts, 'macbuildenv.sh'),
                          ['CC', 'CXX'])
 elif platform.system() == 'Windows':
     MAKE = env.get('MAKE', 'mozmake')
     os.environ['SOURCE'] = DIR.source
     if word_bits == 64:
         os.environ['USE_64BIT'] = '1'
     set_vars_from_script(posixpath.join(PDIR.scripts, 'winbuildenv.sh'),
--- a/js/src/devtools/automation/macbuildenv.sh
+++ b/js/src/devtools/automation/macbuildenv.sh
@@ -5,23 +5,10 @@ mk_add_options() {
   : do nothing
 }
 ac_add_options() {
   : do nothing
 }
 
 topsrcdir="$SOURCE"
 
-if [ -n "$AUTOMATION" ]; then
-    # Download clang and some other things from tooltool server.
-    # This should be done before running mozconfig to make clang detection
-    # there work properly.
-    TT_SERVER=${TT_SERVER:-https://api.pub.build.mozilla.org/tooltool/}
-    ( cd $SOURCE/..; \
-      ./scripts/scripts/tooltool/tooltool_wrapper.sh \
-          $SOURCE/browser/config/tooltool-manifests/macosx64/releng.manifest \
-          $TT_SERVER \
-          setup.sh \
-          $TOOLTOOL_HOME/tooltool.py )
-fi
-
 # Setup CC and CXX variables
 . $topsrcdir/build/macosx/mozconfig.common