me
/
guix
Archived
1
0
Fork 0
Code

Revert "gnu: ccls: Configure using -isystem for header files." 

This reverts commit 2c82d4ad10.
master
Brett Gilio 2019-12-16 14:05:17 -06:00
parent 792c3db553
commit 1171c4b3c0
No known key found for this signature in database
GPG Key ID: 672243C4A03F0EEE
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnu/packages/cpp.scm
View File

@ -6,7 +6,6 @@
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl> ;;; Copyright © 2019 Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>
;;; Copyright © 2019 Brett Gilio <brettg@posteo.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -36,9 +35,7 @@
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages code) #:use-module (gnu packages code)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages gcc)
#:use-module (gnu packages llvm) #:use-module (gnu packages llvm)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
@ -308,17 +305,12 @@ tools (containers, algorithms) used by other QuantStack packages.")
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ; no check target. '(#:tests? #f)) ; no check target.
#:configure-flags (inputs
(list (string-append "-DCMAKE_CXX_FLAGS='-isystem " `(("rapidjson" ,rapidjson)))
(assoc-ref %build-inputs "gcc")
"/include/c++'"))))
(inputs
`(("clang" ,clang)
("ncurses" ,ncurses)))
(native-inputs (native-inputs
`(("rapidjson" ,rapidjson) `(("clang" ,clang)
("gcc" ,gcc))) ("llvm" ,llvm)))
(home-page "https://github.com/MaskRay/ccls") (home-page "https://github.com/MaskRay/ccls")
(synopsis "C/C++/Objective-C language server") (synopsis "C/C++/Objective-C language server")
(description (description