diff options
| author | Ravi R Kiran <aine.marina@gmail.com> | 2022-04-07 14:21:45 (GMT) |
|---|---|---|
| committer | Ravi R Kiran <aine.marina@gmail.com> | 2022-04-07 14:21:45 (GMT) |
| commit | 5f3922b540886a921a548d19efbfb01d628ef1c6 (patch) | |
| tree | 9ee1bc55d8889d3f08c7708362275ad42a64db87 | |
| parent | fc7d9e32c55292118362dbd59ccab4e811aa326c (diff) | |
| download | dotemacs-5f3922b540886a921a548d19efbfb01d628ef1c6.zip dotemacs-5f3922b540886a921a548d19efbfb01d628ef1c6.tar.gz dotemacs-5f3922b540886a921a548d19efbfb01d628ef1c6.tar.bz2 | |
Safer build paths
| -rw-r--r-- | lisp/ravi-init-cpp.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/ravi-init-cpp.el b/lisp/ravi-init-cpp.el index ea3b109..f2b1e6e 100644 --- a/lisp/ravi-init-cpp.el +++ b/lisp/ravi-init-cpp.el @@ -380,11 +380,12 @@ this to 3 makes header-protection define KIG_MISC_NEWTYPE_H for a file named (bind-key "]" 'ravi/insert-closing-delimiter c-mode-base-map) (use-package rtags - :load-path (lambda () (ravi/emacs-file "site-lisp/rtags/src")) + :load-path (lambda () (ravi/emacs-file "site-lisp/rtags/build/src")) :config (progn (setq use-rtags-hydra t) - (setq rtags-path (ravi/emacs-file "site-lisp/rtags/bin")) + (defvar ravi/rtags-path nil "Path to RTags binary") + (setq rtags-path (or ravi/rtags-path (ravi/emacs-file "site-lisp/rtags/build/bin"))) (setq rtags-autostart-diagnostics t) (setq rtags-completions-enabled t) (when (equal ravi/use-selection-system 'helm) @@ -448,7 +449,8 @@ this to 3 makes header-protection define KIG_MISC_NEWTYPE_H for a file named (use-package ccls :if (eq ravi/use-cpp-lsp-backend 'ravi/use-cpp-ccls) :config - (setq ccls-executable (ravi/emacs-file "site-lisp/ccls/Release/ccls")) + (defvar ravi/ccls-executable nil "CCLS executable") + (setq ccls-executable (or ravi/ccls-executable (ravi/emacs-file "site-lisp/ccls/Release/ccls"))) (setq ccls-args `(,(concat "--log-file=" (ravi/past-file "ccls.log")))) ; to do: use relative path ) |