From 061f204dcd9d003a45026baff4bd1492306029d0 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 20 Mar 2018 00:03:05 +0100 Subject: 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. --- guix/build-system/meson.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'guix/build-system') 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 , 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 -- cgit v1.2.3