summaryrefslogtreecommitdiff
path: root/guix/build-system
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2018-03-20 00:03:05 +0100
committerMarius Bakke <mbakke@fastmail.com>2018-03-20 00:06:50 +0100
commit061f204dcd9d003a45026baff4bd1492306029d0 (patch)
tree396614907a475abb122a4e4dc5b55550070e9ce3 /guix/build-system
parentb1d096f869ed53b84486855d73c7e9070fdf3ae2 (diff)
Revert "build-system/meson: Use 'target-arm32?' for armhf-linux case."
This requires adding (guix utils) to the build inputs, and causes too many rebuilds for now. This reverts commit 24a2e9172a2d8970d57865c6130f2184385183a3.
Diffstat (limited to 'guix/build-system')
-rw-r--r--guix/build-system/meson.scm6
1 files changed, 4 insertions, 2 deletions
diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm
index 88a7b58286..529a2b8b0f 100644
--- a/guix/build-system/meson.scm
+++ b/guix/build-system/meson.scm
@@ -86,7 +86,8 @@
;; to avoid superfluous entries in RUNPATH as described
;; in <https://bugs.gnu.org/28444#46>, so armhf may now
;; have different runtime dependencies from other arches.
- ,@(if (not (target-arm32?))
+ ,@(if (not (string-prefix? "arm" (or (%current-target-system)
+ (%current-system))))
`(("patchelf" ,(default-patchelf)))
'())
,@native-inputs))
@@ -147,7 +148,8 @@ has a 'meson.build' file."
#:search-paths ',(map search-path-specification->sexp
search-paths)
#:phases
- (if (target-arm32?)
+ (if (string-prefix? "arm" ,(or (%current-target-system)
+ (%current-system)))
(modify-phases build-phases (delete 'fix-runpath))
build-phases)
#:configure-flags ,configure-flags