Bug 1322402 - Use config from macosx64 instead macosx-universal. r=rail
authorRichard Marti <richard.marti@gmail.com>
Fri, 17 Feb 2017 17:39:33 +0100
changeset 14917 a7218494e505ba92d75209c7aa226b3b80fe509e
parent 14915 4f814a83ba4fa389cd846f067d7a6d90d1e3734b
child 14918 aaf7f4db57ff6e0ed08d4fb3d2386476edf26e97
push id10438
push userraliiev@mozilla.com
push dateFri, 17 Feb 2017 17:48:13 +0000
reviewersrail
bugs1322402
Bug 1322402 - Use config from macosx64 instead macosx-universal. r=rail MozReview-Commit-ID: 5wtOB1AZJoh
mozilla/thunderbird_config.py
--- a/mozilla/thunderbird_config.py
+++ b/mozilla/thunderbird_config.py
@@ -273,25 +273,25 @@ PLATFORM_VARS = {
             'slaves': SLAVES['linux64-av'],
         },
         'macosx64': {
             'product_name': 'thunderbird',
             'unittest_platform': 'macosx64-opt',
             'app_name': 'mail',
             'base_name': builder_prefix + 'OS X 10.7 %(branch)s',
             'mozconfig': 'macosx64/%(branch)s/nightly',
-            'src_mozconfig': 'mail/config/mozconfigs/macosx-universal/nightly',
+            'src_mozconfig': 'mail/config/mozconfigs/macosx64/nightly',
             'packageTests': True,
             'profiled_build': False,
             'builds_before_reboot': thunderbird_localconfig.BUILDS_BEFORE_REBOOT,
             'build_space': 12,
             'upload_symbols': True,
             'download_symbols': True,
             'slaves': SLAVES['macosx64-lion'],
-            'platform_objdir': "%s/i386" % OBJDIR,
+            'platform_objdir': OBJDIR,
             'stage_product': 'thunderbird',
             'stage_platform': 'macosx64',
             'update_platform': 'Darwin_x86_64-gcc3',
             'enable_shared_checkouts': True,
             'env': {
                 'MOZ_OBJDIR': OBJDIR,
                 'HG_SHARE_BASE_DIR': '/builds/hg-shared',
                 'CHOWN_ROOT': '~/bin/chown_root',