diff options
Diffstat (limited to 'gnu/packages/build-tools.scm')
| -rw-r--r-- | gnu/packages/build-tools.scm | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index a694a7ddad..5c11266c89 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -102,8 +102,8 @@ generate such a compilation database.") (license license:gpl3+))) (define-public gn - (let ((commit "1ab6fa2cab7ec64840db720a56018ca8939329f9") - (revision "1530")) ;as returned by `git describe`, used below + (let ((commit "6e5ba2e7210823cf7ccce3eb2a23336a4e7f1349") + (revision "1666")) ;as returned by `git describe`, used below (package (name "gn") (version (git-version "0.0" revision commit)) @@ -113,17 +113,15 @@ generate such a compilation database.") (uri (git-reference (url home-page) (commit commit))) (sha256 (base32 - "06h974d1lag3wwsz6s5asmpv0njmf671ag4la2fpnbh494m97lfk")) + "157ax65sixjm0i1j89wvny48v1mbsl4pbvv5vqinjc6r0fryaf2r")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - `(#:tests? #f ;FIXME: How to run? - #:phases (modify-phases %standard-phases + `(#:phases (modify-phases %standard-phases (add-before 'configure 'set-build-environment (lambda _ (setenv "CC" "gcc") (setenv "CXX" "g++") (setenv "AR" "ar") - (setenv "LDFLAGS" "-pthread") #t)) (replace 'configure (lambda _ @@ -143,6 +141,14 @@ generate such a compilation database.") (lambda _ (invoke "ninja" "-C" "out" "gn" "-j" (number->string (parallel-job-count))))) + (replace 'check + (lambda* (#:key (tests? #t) #:allow-other-keys) + (if tests? + (lambda () + (invoke "ninja" "-C" "out" "gn_unittests" + "-j" (number->string (parallel-job-count))) + (invoke "./out/gn_unittests")) + (format #t "test suite not run~%")))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) |