aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2018-03-22 09:14:53 +0200
committerDanny Milosavljevic <dannym@scratchpost.org>2018-04-16 19:58:05 +0200
commit67ca98ec7818f5b63fe041bfee4ef10826635685 (patch)
tree1d32cc2cad14f4e2fbfa2995e7a6232930e15c13
parentaf4ea9c5cbeb6fe9c3c694d97db07c335c2e51c9 (diff)
downloadguix-67ca98ec7818f5b63fe041bfee4ef10826635685.tar.gz
guix-67ca98ec7818f5b63fe041bfee4ef10826635685.zip
gnu: rust: Don't build for "native" arch on ARM.
* gnu/packages/rust.scm (rust-1.23)<#:phases>[dont-build-native]: New phase.
-rw-r--r--gnu/packages/rust.scm6
1 files changed, 6 insertions, 0 deletions
diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 8c5abfcbae..0df649c119 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -351,6 +351,12 @@ safety and thread safety guarantees.")
(substitute-keyword-arguments (package-arguments rust-1.19)
((#:phases phases)
`(modify-phases ,phases
+ (add-after 'unpack 'dont-build-native
+ (lambda _
+ ;; XXX: Revisit this when we use gcc 6.
+ (substitute* "src/binaryen/CMakeLists.txt"
+ (("ADD_COMPILE_FLAG\\(\\\"-march=native\\\"\\)") ""))
+ #t))
(add-after 'patch-tests 'patch-cargo-tests
(lambda _
(substitute* "src/tools/cargo/tests/build.rs"