]> code.delx.au - gnu-emacs-elpa/commitdiff
company-clang--build-complete-args: don't call -cc1 directly
authorDmitry Gutov <dgutov@yandex.ru>
Sat, 17 May 2014 22:40:09 +0000 (01:40 +0300)
committerDmitry Gutov <dgutov@yandex.ru>
Sat, 17 May 2014 22:40:09 +0000 (01:40 +0300)
#111

company-clang.el

index a53a29675471edc635dc5e522d1755316587ea35..041754fb8b73bcf131538a8c2d2d1765651b7cbe 100644 (file)
@@ -217,14 +217,14 @@ or automatically through a custom `company-clang-prefix-guesser'."
                   t))))))
 
 (defsubst company-clang--build-complete-args (pos)
-  (append '("-cc1" "-fsyntax-only" "-code-completion-macros")
+  (append '("-fsyntax-only" "-Xclang" "-code-completion-macros")
           (unless (company-clang--auto-save-p)
             (list "-x" (company-clang--lang-option)))
           company-clang-arguments
           (when (stringp company-clang--prefix)
             (list "-include" (expand-file-name company-clang--prefix)))
-          '("-code-completion-at")
-          (list (company-clang--build-location pos))
+          (list "-Xclang" (format "-code-completion-at=%s"
+                                  (company-clang--build-location pos)))
           (list (if (company-clang--auto-save-p) buffer-file-name "-"))))
 
 (defun company-clang--candidates (prefix callback)