ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-11 13:49:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: ldc, bap: Build with Clang 3.8.

Browse source 
* gnu/packages/ldc.scm (ldc-bootstrap, ldc): Change LLVM and CLANG to LLVM-3.8
and CLANG-3.8.
* gnu/packages/ocaml.scm (bap)[native-inputs]: Change CLANG to CLANG-3.8.
[propagated-inputs, inputs]: Change LLVM to LLVM-3.8.
This commit is contained in:
Marius Bakke 2018-04-05 19:18:41 +02:00
parent 9bdbabe963
commit 67b5785e3c
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gnu/packages/ldc.scm
View file

@ -138,8 +138,8 @@ (define-public ldc-bootstrap
("tzdata" ,tzdata) ("tzdata" ,tzdata)
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (native-inputs
`(("llvm" ,llvm) `(("llvm" ,llvm-3.8)
("clang" ,clang) ("clang" ,clang-3.8)
("python-lit" ,python-lit) ("python-lit" ,python-lit)
("python-wrapper" ,python-wrapper) ("python-wrapper" ,python-wrapper)
("unzip" ,unzip) ("unzip" ,unzip)
@ -246,8 +246,8 @@ (define-public ldc
(setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc")) (setenv "CC" (string-append (assoc-ref inputs "gcc") "/bin/gcc"))
(invoke "make" "test" "-j" (number->string (parallel-job-count)))))))) (invoke "make" "test" "-j" (number->string (parallel-job-count))))))))
(native-inputs (native-inputs
`(("llvm" ,llvm) `(("llvm" ,llvm-3.8)
("clang" ,clang) ("clang" ,clang-3.8)
("ldc" ,ldc-bootstrap) ("ldc" ,ldc-bootstrap)
("python-lit" ,python-lit) ("python-lit" ,python-lit)
("python-wrapper" ,python-wrapper) ("python-wrapper" ,python-wrapper)

6
gnu/packages/ocaml.scm
View file

@ -3494,13 +3494,13 @@ (define-public bap
(build-system ocaml-build-system) (build-system ocaml-build-system)
(native-inputs (native-inputs
`(("oasis" ,ocaml-oasis) `(("oasis" ,ocaml-oasis)
("clang" ,clang) ("clang" ,clang-3.8)
("ounit" ,ocaml-ounit))) ("ounit" ,ocaml-ounit)))
(propagated-inputs (propagated-inputs
`(("core-kernel" ,ocaml-core-kernel) `(("core-kernel" ,ocaml-core-kernel)
("ppx-driver" ,ocaml-ppx-driver) ("ppx-driver" ,ocaml-ppx-driver)
("uri" ,ocaml-uri) ("uri" ,ocaml-uri)
("llvm" ,llvm) ("llvm" ,llvm-3.8)
("gmp" ,gmp) ("gmp" ,gmp)
("clang-runtime" ,clang-runtime) ("clang-runtime" ,clang-runtime)
("fileutils" ,ocaml-fileutils) ("fileutils" ,ocaml-fileutils)
@ -3516,7 +3516,7 @@ (define-public bap
("bitstring" ,ocaml-bitstring) ("bitstring" ,ocaml-bitstring)
("ppx-jane" ,ocaml-ppx-jane) ("ppx-jane" ,ocaml-ppx-jane)
("re" ,ocaml-re))) ("re" ,ocaml-re)))
(inputs `(("llvm" ,llvm))) (inputs `(("llvm" ,llvm-3.8)))
(arguments (arguments
`(#:use-make? #t `(#:use-make? #t
#:phases #:phases