vim/YouCompleteMe
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Don't pass extra include path to libclang"

Browse Source 
This reverts commit 7bdff8941c.
This commit is contained in:
Strahinja Val Markovic 2014-04-02 15:41:48 -07:00
parent 9865d479e1
commit e17be2f81c
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
python/ycm/completers/cpp/flags.py
View File

@ -35,11 +35,13 @@ class Flags( object ):
def __init__( self ): def __init__( self ):
# It's caches all the way down... # It's caches all the way down...
self.flags_for_file = {} self.flags_for_file = {}
self.special_clang_flags = _SpecialClangIncludes()
self.no_extra_conf_file_warning_posted = False self.no_extra_conf_file_warning_posted = False
def FlagsForFile( self, def FlagsForFile( self,
filename, filename,
add_special_clang_flags = True,
client_data = None ): client_data = None ):
try: try:
return self.flags_for_file[ filename ] return self.flags_for_file[ filename ]
@ -62,6 +64,8 @@ class Flags( object ):
if not flags: if not flags:
return None return None
if add_special_clang_flags:
flags += self.special_clang_flags
sanitized_flags = PrepareFlagsForClang( flags, filename ) sanitized_flags = PrepareFlagsForClang( flags, filename )
if results[ 'do_cache' ]: if results[ 'do_cache' ]:
@ -194,5 +198,9 @@ def _RemoveUnusedFlags( flags, filename ):
return new_flags return new_flags
def _SpecialClangIncludes():
libclang_dir = os.path.dirname( ycm_core.__file__ )
path_to_includes = os.path.join( libclang_dir, 'clang_includes' )
return [ '-isystem', path_to_includes ]