From 24a2e9172a2d8970d57865c6130f2184385183a3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 19 Mar 2018 22:06:22 +0200 Subject: 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. --- guix/build-system/meson.scm | 6 ++---- 1 file 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 , 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 -- cgit v1.2.3