Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

generalize the system include detection a bit 

This should help when using a non-standard sysroot, common in cross-compiling
This commit is contained in:
Adam C. Foltzer 2017-06-02 08:20:56 -07:00 committed by Jussi Pakkanen
parent 7c03bfb463
commit a53e44ad63
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mesonbuild/dependencies/misc.py
View File

@ -124,8 +124,12 @@ class BoostDependency(Dependency):
# For now, use -isystem for all includes except for some
# typical defaults (which don't need to be included at all
# since they are in the default include paths)
if include_dir != '/usr/include' and include_dir != '/usr/local/include':
# since they are in the default include paths). These typical
# defaults include the usual directories at the root of the
# filesystem, but also any path that ends with those directory
# names in order to handle cases like cross-compiling where we
# might have a different sysroot.
if not include_dir.endswith(('/usr/include', '/usr/local/include')):
args.append("".join(self.cpp_compiler.get_include_args(include_dir, True)))
return args