From 8339ccac5fc294fb3d0a0f62fe91c9dfaf0ba28f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 29 Mar 2019 17:06:58 +0300 Subject: gnu: python-faiss: Fix building on non-Intel architectures. * gnu/packages/graph.scm (python-faiss)[arguments]: Adjust custom 'build-swig phase to change build flags for different archictures. --- gnu/packages/graph.scm | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 216b48195d..9dca2be98e 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -358,16 +358,15 @@ CPUFLAGS = ~{~a ~}~%" (assoc-ref inputs "python*") python-version (assoc-ref inputs "python-numpy") python-version python-version - (cons "-mpopcnt" - (list ,@(let ((system (or (%current-target-system) - (%current-system)))) - (cond - ((string-prefix? "x86_64" system) - '("-mavx" "-msse2")) - ((string-prefix? "i686" system) - '("-msse2")) - (else - '()))))))))) + (list ,@(let ((system (or (%current-target-system) + (%current-system)))) + (cond + ((string-prefix? "x86_64" system) + '("-mavx" "-msse2" "-mpopcnt")) + ((string-prefix? "i686" system) + '("-msse2" "-mpopcnt")) + (else + '())))))))) (substitute* "Makefile" (("../libfaiss.a") "")) (invoke "make" "cpu")))))) -- cgit 1.4.1