02/02: gnu: python-faiss: Fix building on non-Intel architectures.

[guix-commits]

efraim pushed a commit to branch master
in repository guix.

commit 8339ccac5fc294fb3d0a0f62fe91c9dfaf0ba28f
Author: Efraim Flashner <address@hidden>
Date:   Fri Mar 29 17:06:58 2019 +0300

    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 216b481..9dca2be 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"))))))