Bug 1360771 - llvm-config is N/A on FreeBSD try llvm-config39 as well. r=rillian draft
authorJan Beich <jbeich@FreeBSD.org>
Sat, 29 Apr 2017 02:12:43 +0000
changeset 570650 8e0b7c6ecba3f795198ae901b056bb1785aaf318
parent 570578 308cdb913d717f8edc932f5bac93854e3e54b84d
child 626537 25e5377305e9f185cf4d483f3be1aaeb965fd50c
push id56544
push userbmo:jbeich@FreeBSD.org
push dateSat, 29 Apr 2017 17:40:46 +0000
reviewersrillian
bugs1360771
milestone55.0a1
Bug 1360771 - llvm-config is N/A on FreeBSD try llvm-config39 as well. r=rillian llvm39 package on FreeBSD installs llvm-config under non-default prefix with llvm-config39 wrapper under PATH. No package currently provides default/unsuffixed llvm-config. So, adjust lookup to avoid having to add "export LLVM_CONFIG=llvm-config39" in .mozconfig for the common case when Stylo bindgen is known to work. MozReview-Commit-ID: 9PmnpTPoBcR
toolkit/moz.configure
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -582,17 +582,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-3.9', 'llvm-config',),
+llvm_config = check_prog('LLVM_CONFIG', ('llvm-config-3.9', 'llvm-config39', '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 (version 3.9.x')
 option('--with-clang-path', nargs=1,