From: Dmitry Gutov <dgutov@yandex.ru>
Date: Sat, 17 May 2014 22:40:09 +0000 (+0300)
Subject: company-clang--build-complete-args: don't call -cc1 directly
X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/8a9be8620ee5d84cfdb6a37e76ebed4cf73dc8a4?ds=sidebyside

company-clang--build-complete-args: don't call -cc1 directly

#111
---

diff --git a/company-clang.el b/company-clang.el
index a53a29675..041754fb8 100644
--- a/company-clang.el
+++ b/company-clang.el
@@ -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)