From 919034068ecca6cd16b110fa44246bfe758f984e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 22 Mar 2018 20:32:48 +0200 Subject: Revert "build-system/meson: Use 'target-arm32?' for armhf-linux case." This reverts commit 3a7597e4147235781d43ba9cef7a52ced9ea5e7a. --- guix/build-system/meson.scm | 6 ++++-- 1 file 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 @@ (define private-keywords ;; to avoid superfluous entries in RUNPATH as described ;; in , 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 @@ (define builder #: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 -- cgit v1.2.3