Bug 1490549 - Fix some comments r=froydnj
authorMike Hommey <mh+mozilla@glandium.org>
Sat, 15 Sep 2018 01:14:29 +0000
changeset 492145 2ba4d3d517aacb225e1fdcee0cfb1d74f821210f
parent 492144 67a5acf7363d9dd2c8532967ec1beb0c200abc2c
child 492146 87ae93caad9b0c48edaf349633c275e4e0059e9e
child 492262 a8dd5d2c8cfff22dd7d349d9fea236e1f90cf493
push id9984
push userffxbld-merge
push dateMon, 15 Oct 2018 21:07:35 +0000
treeherdermozilla-beta@183d27ea8570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1490549
milestone64.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 1490549 - Fix some comments r=froydnj Differential Revision: https://phabricator.services.mozilla.com/D5916
build/moz.configure/toolchain.configure
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -714,17 +714,17 @@ def default_c_compilers(host_or_target, 
             # When getting default C compilers for the host, we prioritize the
             # same compiler as the target C compiler.
             prioritized = info.compiler
             if info.type == 'gcc':
                 same_arch = same_arch_different_bits()
                 if (target.cpu != host_or_target.cpu and
                         (target.cpu, host_or_target.cpu) not in same_arch and
                         (host_or_target.cpu, target.cpu) not in same_arch):
-                    # If the target C compiler if GCC, and it can't be used with
+                    # If the target C compiler is GCC, and it can't be used with
                     # -m32/-m64 for the host, it's probably toolchain-prefixed,
                     # so we prioritize a raw 'gcc' instead.
                     prioritized = info.type
             elif info.type == 'clang' and android_clang_compiler:
                 # Android NDK clangs do not function as host compiler, so
                 # prioritize a raw 'clang' instead.
                 prioritized = info.type
 
@@ -759,19 +759,19 @@ def default_cxx_compilers(c_compiler, ot
     target platforms.
     `c_compiler` is the @depends function returning a Compiler instance for
     the desired platform.
 
     Because the build system expects the C and C++ compilers to be from the
     same compiler suite, we derive the default C++ compilers from the C
     compiler that was found if none was provided.
 
-    We also factor the target C++ compiler when getting the default host
-    C++ compiler, using the same if the corresponding C compilers are the
-    same.
+    We also factor in the target C++ compiler when getting the default host
+    C++ compiler, using the target C++ compiler if the host and target C
+    compilers are the same.
     '''
 
     assert (other_c_compiler is None) == (other_cxx_compiler is None)
     if other_c_compiler is not None:
         other_compilers = (other_c_compiler, other_cxx_compiler)
     else:
         other_compilers = ()