[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: build-system/meson: Use 'target-arm32?' for armhf-linux case.
From: |
Efraim Flashner |
Subject: |
01/01: build-system/meson: Use 'target-arm32?' for armhf-linux case. |
Date: |
Mon, 19 Mar 2018 16:08:20 -0400 (EDT) |
efraim pushed a commit to branch staging
in repository guix.
commit 24a2e9172a2d8970d57865c6130f2184385183a3
Author: Efraim Flashner <address@hidden>
Date: Mon Mar 19 22:06:22 2018 +0200
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 529a2b8..88a7b58 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