summary refs log tree commit diff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2017-02-03 19:17:47 +0200
committerEfraim Flashner <efraim@flashner.co.il>2017-02-03 19:17:47 +0200
commiteffd7198b91f85b1bf36ab87392068b3597b6ca8 (patch)
treeccfcb479d0c6e77bf18a609ca0c6207cc390c8ca
parent89eb56f05fa1561b09d1050147d968b98a16b07a (diff)
downloadguix-effd7198b91f85b1bf36ab87392068b3597b6ca8.tar.gz
gnu: zpaq: Tune for 'generic-armv7-a' on armhf.
* gnu/packages/compression.scm (zpaq)[arguments]: Change the CXXFLAGS so
on armhf-linux we build with '-mtune=generic-armv7-a' and not '-mtune=generic'.
-rw-r--r--gnu/packages/compression.scm9
1 files changed, 5 insertions, 4 deletions
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 73a35030e9..fbbc32197a 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -7,7 +7,7 @@
 ;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2015 Jeff Mickey <j@codemac.net>
-;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
 ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
 ;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice <me@tobias.gr>
@@ -1034,11 +1034,12 @@ functionality in a C++ iostream.")
                                (_               " -DNOJIT")))
         ;; These should be safe, lowest-common-denominator instruction sets,
         ;; allowing for some optimisation while remaining reproducible.
-        (string-append "CXXFLAGS=-O3 -mtune=generic -DNDEBUG"
+        (string-append "CXXFLAGS=-O3 -DNDEBUG"
                        ,(match (or (%current-target-system)
                                    (%current-system))
-                               ("x86_64-linux"  " -march=nocona")
-                               ("i686-linux"    " -march=i686")
+                               ("x86_64-linux"  " -march=nocona -mtune=generic")
+                               ("i686-linux"    " -march=i686 -mtune=generic")
+                               ("armhf-linux"   " -mtune=generic-armv7-a")
                                (_               "")))
         (string-append "PREFIX="
                        (assoc-ref %outputs "out")))))