Don't pass extra include path to libclang

This commit is contained in:
Nicholas Hutchinson 2014-03-26 10:06:56 +00:00
parent cca4785fb6
commit 7bdff8941c

View File

@ -35,13 +35,11 @@ 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 ]
@ -64,8 +62,6 @@ 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' ]:
@ -198,9 +194,5 @@ 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 ]