TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Add workaround for clang header search limitation

Browse source 
clang searches for its installed headers relative to the path of the
program calling it, which doesn't work when the caller is a custom
program running from directory other than the system clang installation
directory.  Add a hook to the compilation database support to let the
user inject extra flags into the database, which can be used to add
`-isystem $PATH_TO_INSTALLED_CLANG_HEADERS` to the recorded commands, so
that when the clang library loads the compilation database, it finds the
headers.
This commit is contained in:
Kp 2019-10-21 03:45:29 +00:00
parent 9d22103d45
commit fc81a56e68
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
SConstruct
View file

@ -3758,6 +3758,12 @@ class DXXCommon(LazyObjectConstructor):
('CPPFLAGS_unchecked', None, None),
('CXXFLAGS_unchecked', None, None),
('LINKFLAGS_unchecked', None, None),
# Flags that are injected into the compilation
# database, but which are not used in the actual
# compilation. Use this to work around clang's
# inability to find its own headers when invoked
# from custom tools.
('CXXFLAGS_compilation_database', None, None),
),
},
{
@ -4110,9 +4116,14 @@ class DXXCommon(LazyObjectConstructor):
# absolute, but `clang-check` refuses to find files when this is
# relative.
directory = env.Dir('.').get_abspath()
CXXFLAGS_compilation_database = self.user_settings.CXXFLAGS_compilation_database
_dxx_cxxcom_no_prefix = env._dxx_cxxcom_no_prefix
if CXXFLAGS_compilation_database:
_dxx_cxxcom_no_prefix = _dxx_cxxcom_no_prefix.replace('$CXXFLAGS', '$CXXFLAGS $CXXFLAGS_compilation_database')
kwargs['CXXFLAGS_compilation_database'] = CXXFLAGS_compilation_database
self._compilation_database_entries.extend([
{
'command' : env.Override(kwargs).subst(env._dxx_cxxcom_no_prefix, target=[o], source=source),
'command' : env.Override(kwargs).subst(_dxx_cxxcom_no_prefix, target=[o], source=source),
'directory' : directory,
'file' : relative_file_path,
'output' : str(o),