Bug 1519042 - Replace the last non-third-part uses of OS_TEST with TARGET_CPU. r=ted
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 10 Jan 2019 22:06:10 +0000
changeset 510460 c3bbc980a4d69302bddc2b384654d9f2c674978f
parent 510459 1c8e5a4781fc7fe9ccd63012c6dc61bac25fc459
child 510461 653fa722ad95365d077f0392c86c5b418af1679f
push id10547
push userffxbld-merge
push dateMon, 21 Jan 2019 13:03:58 +0000
treeherdermozilla-beta@24ec1916bffe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1519042
milestone66.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 1519042 - Replace the last non-third-part uses of OS_TEST with TARGET_CPU. r=ted Depends on D16161 Differential Revision: https://phabricator.services.mozilla.com/D16162
dom/plugins/test/testplugin/testplugin.mozbuild
python/mozbuild/mozbuild/action/dumpsymbols.py
--- a/dom/plugins/test/testplugin/testplugin.mozbuild
+++ b/dom/plugins/test/testplugin/testplugin.mozbuild
@@ -39,17 +39,17 @@ DisableStlWrapping()
 
 NO_PGO = True
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     RCFILE  = 'nptest.rc'
     RESFILE = 'nptest.res'
     DEFFILE = 'nptest.def'
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa' and '64' in CONFIG['OS_TEST']:
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa' and CONFIG['TARGET_CPU'] == 'x86_64':
     OS_LIBS += ['-framework Carbon']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
     CXXFLAGS += CONFIG['MOZ_GTK2_CFLAGS']
     CFLAGS += CONFIG['MOZ_GTK2_CFLAGS']
     OS_LIBS += CONFIG['MOZ_GTK2_LIBS']
     OS_LIBS += CONFIG['XLDFLAGS']
     OS_LIBS += CONFIG['XLIBS']
--- a/python/mozbuild/mozbuild/action/dumpsymbols.py
+++ b/python/mozbuild/mozbuild/action/dumpsymbols.py
@@ -33,17 +33,20 @@ def dump_symbols(target, tracking_file, 
     dump_syms_bin = '%s%s' % (dump_syms_bin, buildconfig.substs['BIN_SUFFIX'])
 
     os_arch = buildconfig.substs['OS_ARCH']
     if os_arch == 'WINNT':
         sym_store_args.extend(['-c', '--vcs-info'])
         if os.environ.get('PDBSTR_PATH'):
             sym_store_args.append('-i')
     elif os_arch == 'Darwin':
-        sym_store_args.extend(['-c', '-a', buildconfig.substs['OS_TEST'], '--vcs-info'])
+        cpu = {
+            'x86': 'i386',
+        }.get(buildconfig.substs['TARGET_CPU'], buildconfig.substs['TARGET_CPU'])
+        sym_store_args.extend(['-c', '-a', cpu, '--vcs-info'])
     elif os_arch == 'Linux':
         sym_store_args.extend(['-c', '--vcs-info'])
 
     sym_store_args.append('--install-manifest=%s,%s' % (os.path.join(buildconfig.topobjdir,
                                                                      '_build_manifests',
                                                                      'install',
                                                                      'dist_include'),
                                                         os.path.join(buildconfig.topobjdir,