Treat include paths as relative to CWD of CC command

rdnetto · May 16, 2016 · 2e8f06a · 2e8f06a
1 parent 74ea5db
commit 2e8f06a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/config_gen.py b/config_gen.py
@@ -337,8 +337,12 @@ def parse_flags(build_log):
         line_count += 1
         words = split_flags(line)
 
+        cmd_pwd = './'
+
         for (i, word) in enumerate(words):
             if(word[0] != '-' or not flags_whitelist.match(word)):
+                if(word.find('YCM_CONFIG_GEN_PWD') == 0):
+                    cmd_pwd = word[word.find("=") + 1:]
                 continue
 
             # handle macro definitions
@@ -353,7 +357,7 @@ def parse_flags(build_log):
 
             # include arguments for this option, if there are any, as a tuple
             if(i != len(words) - 1 and word in filename_flags and words[i + 1][0] != '-'):
-                flags.add((word, words[i + 1]))
+                flags.add((word, os.path.realpath(os.path.join(cmd_pwd, words[i + 1]))))
             else:
                 flags.add(word)
 

diff --git a/fake-toolchain/Unix/cc b/fake-toolchain/Unix/cc
@@ -9,6 +9,6 @@ elif [ "$1" = "-v" ] || [ "$1" = "--version" ]; then
     $YCM_CONFIG_GEN_CC_PASSTHROUGH $@
 
 else
-    echo "$@" >> $YCM_CONFIG_GEN_CC_LOG
+	echo "YCM_CONFIG_GEN_PWD=$(pwd) $@" >> $YCM_CONFIG_GEN_CC_LOG
 fi