summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2016-08-27 17:23:58 +0100
committerLeo Famulari <leo@famulari.name>2016-09-13 01:12:42 -0400
commit8eaf53e36683198522d71d7c60e258678be39416 (patch)
tree21b204fd5e20980a44aeb1942986efe02934eab7 /gnu
parentf40841e99963af9c977f91a319c406d791935e9b (diff)
downloadguix-8eaf53e36683198522d71d7c60e258678be39416.tar.gz
gnu: dlib: Do not build dlib twice for tests.
* gnu/packages/machine-learning.scm (dlib)[arguments]: Use makefile
instead of cmake in check phase to prevent full rebuild.

Signed-off-by: Leo Famulari <leo@famulari.name>
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/machine-learning.scm7
1 files changed, 3 insertions, 4 deletions
diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm
index 7669702ede..e94ffdd74f 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -502,11 +502,10 @@ single hidden layer, and for multinomial log-linear models.")
          (replace 'check
            (lambda _
              ;; No test target, so we build and run the unit tests here.
-             (let ((test-dir (string-append "../dlib-" ,version "/dlib/test/build")))
-               (mkdir-p test-dir)
+             (let ((test-dir (string-append "../dlib-" ,version "/dlib/test")))
                (with-directory-excursion test-dir
-                 (and (zero? (system* "cmake" ".."))
-                      (zero? (system* "cmake" "--build" "." "--config" "Release"))
+                 (setenv "CXXFLAGS" "-std=gnu++11")
+                 (and (zero? (system* "make" "-j" (number->string (parallel-job-count))))
                       (zero? (system* "./dtest" "--runall")))))))
          (add-after 'install 'delete-static-library
            (lambda* (#:key outputs #:allow-other-keys)