Bug 1344318 - Check for llvm-config-3.9 in configure. r?ted draft
authorMatt Brubeck <mbrubeck@mozilla.com>
Fri, 03 Mar 2017 11:08:23 -0800
changeset 493285 38ff08564faf104970e37f044924f5357d0fea56
parent 493227 77d5a39a4677ed8e32a7ed46561c962d807fa7b1
child 547827 72281fafcef1c6ef9661fbfbb7cdcd47ab4ae799
push id47722
push userbmo:mbrubeck@mozilla.com
push dateFri, 03 Mar 2017 19:18:48 +0000
reviewersted
bugs1344318
milestone54.0a1
Bug 1344318 - Check for llvm-config-3.9 in configure. r?ted MozReview-Commit-ID: 9SoInQFyfLd
toolkit/moz.configure
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -569,17 +569,17 @@ option('--enable-stylo', env='STYLO_ENAB
             'This requires either building servo within Gecko\'s cargo phase '
             'or passing --with-servo')
 
 # 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.
-llvm_config = check_prog('LLVM_CONFIG', ('llvm-config',),
+llvm_config = check_prog('LLVM_CONFIG', ('llvm-config-3.9', 'llvm-config',),
                          what='llvm-config', allow_missing=True)
 
 option('--disable-stylo-build-bindgen',
        help='Enable build-time bindgen for Stylo')
 
 option('--with-libclang-path', nargs=1,
        help='Absolute path to Clang/LLVM libraries for Stylo (at least version 3.9.0')
 option('--with-clang-path', nargs=1,