Bug 1476799 - remove references to Stylo from bindgen configure code; r=gps
authorNathan Froyd <froydnj@mozilla.com>
Wed, 18 Jul 2018 19:11:07 -0400
changeset 427247 39b4e69407b579d1c8a896c97c98d603ee5bc7e6
parent 427246 30dae375573fce73ed4d137c9806a358b011ca8a
child 427248 9daa194d334fd4179899677cfcba2ba5df9d0ee0
push id34297
push userrgurzau@mozilla.com
push dateThu, 19 Jul 2018 09:54:46 +0000
treeherdermozilla-central@183ee39bf309 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1476799
milestone63.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 1476799 - remove references to Stylo from bindgen configure code; r=gps At some point, either bindgen will begin generating not-related-to-Stylo things or we will start using bindgen in multiple places. Either way, the references to Stylo should go away.
toolkit/moz.configure
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -609,21 +609,20 @@ simple_keyfile('Google API')
 id_and_secret_keyfile('Bing API')
 
 simple_keyfile('Adjust SDK')
 
 id_and_secret_keyfile('Leanplum SDK')
 
 simple_keyfile('Pocket API')
 
-# We support setting up the appropriate options for Stylo's build-time
-# bindings generation via setting LLVM_CONFIG or by providing explicit
-# configure options.  The Windows installer of LLVM/Clang doesn't provide
-# llvm-config, so we need both methods to support all of our tier-1
-# platforms.
+# We support setting up the appropriate options for bindgen via setting
+# LLVM_CONFIG or by providing explicit configure options.  The Windows
+# installer of LLVM/Clang doesn't provide llvm-config, so we need both
+# methods to support all of our tier-1 platforms.
 @depends(host)
 @imports('which')
 @imports('os')
 @imports('subprocess')
 def llvm_config_paths(host):
     llvm_supported_versions = ['6.0', '5.0', '4.0', '3.9']
     llvm_config_progs = []
     for version in llvm_supported_versions:
@@ -663,36 +662,36 @@ def llvm_config_paths(host):
     return llvm_config_progs
 
 llvm_config = check_prog('LLVM_CONFIG', llvm_config_paths,
                          when='--enable-compile-environment',
                          what='llvm-config', allow_missing=True)
 
 with only_when('--enable-compile-environment'):
     option('--with-libclang-path', nargs=1,
-           help='Absolute path to a directory containing Clang/LLVM libraries for Stylo (version 3.9.x or above)')
+           help='Absolute path to a directory containing Clang/LLVM libraries for bindgen (version 3.9.x or above)')
     option('--with-clang-path', nargs=1,
-           help='Absolute path to a Clang binary for Stylo bindgen (version 3.9.x or above)')
+           help='Absolute path to a Clang binary for bindgen (version 3.9.x or above)')
 
     def invoke_llvm_config(llvm_config, *options):
         '''Invoke llvm_config with the given options and return the first line of
         output.'''
         lines = check_cmd_output(llvm_config, *options).splitlines()
         return lines[0]
 
     @imports(_from='textwrap', _import='dedent')
     def check_minimum_llvm_config_version(llvm_config):
         version = Version(invoke_llvm_config(llvm_config, '--version'))
         min_version = Version('3.9.0')
         if version < min_version:
             die(dedent('''\
-            llvm installation {} is incompatible with Stylo bindgen.
+            llvm installation {} is incompatible with bindgen.
 
-            To compile Stylo, please install version {} or greater of
-            Clang + LLVM and ensure that the 'llvm-config' from that
+            Please install version {} or greater of Clang + LLVM
+            and ensure that the 'llvm-config' from that
             installation is first on your path.
 
             You can verify this by typing 'llvm-config --version'.
             '''.format(version, min_version)))
 
     @depends(llvm_config, '--with-libclang-path', '--with-clang-path',
              host_library_name_info, host)
     @imports('os.path')
@@ -722,18 +721,18 @@ with only_when('--enable-compile-environ
                     return (True, None)
             else:
                 return (False, list(set(libclang_choices)))
 
         if not libclang_path and not clang_path:
             # We must have LLVM_CONFIG in this case.
             if not llvm_config:
                 die(dedent('''\
-                Could not find LLVM/Clang installation for compiling stylo build-time
-                bindgen.  Please specify the 'LLVM_CONFIG' environment variable
+                Could not find LLVM/Clang installation for compiling bindgen.
+                Please specify the 'LLVM_CONFIG' environment variable
                 (recommended), pass the '--with-libclang-path' and '--with-clang-path'
                 options to configure, or put 'llvm-config' in your PATH.  Altering your
                 PATH may expose 'clang' as well, potentially altering your compiler,
                 which may not be what you intended.'''))
 
             check_minimum_llvm_config_version(llvm_config)
             libclang_arg = '--bindir' if host.os == 'WINNT' else '--libdir'
             libclang_path = invoke_llvm_config(llvm_config, libclang_arg)