summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2018-03-19 22:06:22 +0200
committerEfraim Flashner <efraim@flashner.co.il>2018-03-19 22:07:37 +0200
commit24a2e9172a2d8970d57865c6130f2184385183a3 (patch)
treea1dac0abaadfb3822835fa30060eed9636f467c3
parent05666fb8dbcc7cb482ba1e4caa0fba333a738621 (diff)
downloadpatches-24a2e9172a2d8970d57865c6130f2184385183a3.tar
patches-24a2e9172a2d8970d57865c6130f2184385183a3.tar.gz
build-system/meson: Use 'target-arm32?' for armhf-linux case.
* guix/build-system/meson.scm (lower, meson-build): Replace armhf-linux detection with 'target-arm32?' macro.
-rw-r--r--guix/build-system/meson.scm6
1 files changed, 2 insertions, 4 deletions
diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm
index 529a2b8b0f..88a7b58286 100644
--- a/guix/build-system/meson.scm
+++ b/guix/build-system/meson.scm
@@ -86,8 +86,7 @@
;; 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 (string-prefix? "arm" (or (%current-target-system)
- (%current-system))))
+ ,@(if (not (target-arm32?))
`(("patchelf" ,(default-patchelf)))
'())
,@native-inputs))
@@ -148,8 +147,7 @@ has a 'meson.build' file."
#:search-paths ',(map search-path-specification->sexp
search-paths)
#:phases
- (if (string-prefix? "arm" ,(or (%current-target-system)
- (%current-system)))
+ (if (target-arm32?)
(modify-phases build-phases (delete 'fix-runpath))
build-phases)
#:configure-flags ,configure-flags