Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1363655 - part 2 - check for existence of paths returned by llvm-config; r=rillian

Browse Source 
On some systems, llvm-config may be installed, but not the files to
which it needs to refer.  We should ensure that the values returned
actually make some sense.
This commit is contained in:
Nathan Froyd 2017-06-21 13:28:37 -04:00
parent dbd4e424b9
commit 6acf66edca
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
toolkit/moz.configure
View File

@ -705,11 +705,31 @@ def bindgen_config_paths(stylo_config, bindgen_enabled,
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)
clang_path = os.path.join(invoke_llvm_config(llvm_config, '--bindir'),
'clang')
libclang_path = normsep(libclang_path)
clang_path = normsep(clang_path)
# Debian-based distros, at least, can have llvm-config installed
# but not have other packages installed. Since the user is trying
# to use their system packages, we can't be more specific about what
# they need.
if not os.path.exists(libclang_path)
die(dedent('''\
The directory {} returned by `llvm-config {}` does not exist.
Please check your system configuration.
'''.format(libclang_path, libclang_arg)))
if not os.path.exists(clang_path):
die(dedent('''\
The file {} returned by `llvm-config {}` does not exist.
Please check your system configuration.
'''.format(clang_path, '--bindir')))
return namespace(
libclang_path=normsep(invoke_llvm_config(llvm_config, libclang_arg)),
clang_path=normsep(clang_path),
libclang_path=libclang_path,
clang_path=clang_path,
)
if (not libclang_path and clang_path) or \