diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-18 14:34:04 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-04 11:15:27 +0000 |
| commit | e6430e577f105ad8813c92e75c54660c4985026e (patch) | |
| tree | 88115e5d1fb471fea807111924dcccbeadbf9e4f /chromium/tools/vim | |
| parent | 53d399fe6415a96ea6986ec0d402a9c07da72453 (diff) | |
| download | qtwebengine-chromium-e6430e577f105ad8813c92e75c54660c4985026e.tar.gz | |
BASELINE: Update Chromium to 61.0.3163.99
Change-Id: I8452f34574d88ca2b27af9bd56fc9ff3f16b1367
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/tools/vim')
| -rw-r--r-- | chromium/tools/vim/chromium.ycm_extra_conf.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/chromium/tools/vim/chromium.ycm_extra_conf.py b/chromium/tools/vim/chromium.ycm_extra_conf.py index 266957309b0..cfc434c357f 100644 --- a/chromium/tools/vim/chromium.ycm_extra_conf.py +++ b/chromium/tools/vim/chromium.ycm_extra_conf.py @@ -45,7 +45,7 @@ # * That whole ninja & clang thing? We could support other configs if someone # were willing to write the correct commands and a parser. # -# * This has only been tested on gPrecise. +# * This has only been tested on Linux and macOS. import os import os.path @@ -233,6 +233,9 @@ def GetClangOptionsFromCommandLine(clang_commandline, out_dir, """ clang_flags = [] + additional_flags + def abspath(path): + return os.path.normpath(os.path.join(out_dir, path)) + # Parse flags that are important for YCM's purposes. clang_tokens = shlex.split(clang_commandline) for flag_index, flag in enumerate(clang_tokens): @@ -242,8 +245,7 @@ def GetClangOptionsFromCommandLine(clang_commandline, out_dir, if flag[2] == '/': clang_flags.append(flag) else: - abs_path = os.path.normpath(os.path.join(out_dir, flag[2:])) - clang_flags.append('-I' + abs_path) + clang_flags.append('-I' + abspath(flag[2:])) elif flag.startswith('-std'): clang_flags.append(flag) elif flag.startswith('-') and flag[1] in 'DWFfmO': @@ -257,15 +259,14 @@ def GetClangOptionsFromCommandLine(clang_commandline, out_dir, # Copy over both flags. if flag_index + 1 < len(clang_tokens): clang_flags.append(flag) - clang_flags.append(clang_tokens[flag_index + 1]) + clang_flags.append(abspath(clang_tokens[flag_index + 1])) elif flag.startswith('--sysroot='): # On Linux we use a sysroot image. sysroot_path = flag.lstrip('--sysroot=') if sysroot_path.startswith('/'): clang_flags.append(flag) else: - abs_path = os.path.normpath(os.path.join(out_dir, sysroot_path)) - clang_flags.append('--sysroot=' + abs_path) + clang_flags.append('--sysroot=' + abspath(sysroot_path)) return clang_flags |