Bug 1519042 - Remove OS_TEST. r=ted
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 10 Jan 2019 22:06:12 +0000
changeset 510461 653fa722ad95365d077f0392c86c5b418af1679f
parent 510460 c3bbc980a4d69302bddc2b384654d9f2c674978f
child 510462 36802e2a349090305f53f7ef345bfe6a3f324243
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 - Remove OS_TEST. r=ted Depends on D16162 Differential Revision: https://phabricator.services.mozilla.com/D16163
build/moz.configure/init.configure
--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -846,36 +846,29 @@ def target_variables(target):
     elif target.kernel == 'Darwin' or (target.kernel == 'Linux' and
                                        target.os == 'GNU'):
         os_target = target.kernel
         os_arch = target.kernel
     else:
         os_target = target.os
         os_arch = target.kernel
 
-    if target.kernel == 'Darwin' and target.cpu == 'x86':
-        os_test = 'i386'
-    else:
-        os_test = target.raw_cpu
-
     return namespace(
         OS_TARGET=os_target,
         OS_ARCH=os_arch,
-        OS_TEST=os_test,
         INTEL_ARCHITECTURE=target.cpu in ('x86', 'x86_64') or None,
     )
 
 
 set_config('OS_TARGET', target_variables.OS_TARGET)
 add_old_configure_assignment('OS_TARGET',
                              target_variables.OS_TARGET)
 set_config('OS_ARCH', target_variables.OS_ARCH)
 add_old_configure_assignment('OS_ARCH',
                              target_variables.OS_ARCH)
-set_config('OS_TEST', target_variables.OS_TEST)
 set_config('CPU_ARCH', target.cpu)
 add_old_configure_assignment('CPU_ARCH', target.cpu)
 set_config('INTEL_ARCHITECTURE', target_variables.INTEL_ARCHITECTURE)
 set_config('TARGET_CPU', target.raw_cpu)
 set_config('TARGET_OS', target.raw_os)
 set_config('TARGET_ENDIANNESS', target.endianness)