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.
This commit is contained in:
parent
a53f4311a1
commit
3a7597e414
|
@ -86,8 +86,7 @@
|
||||||
;; to avoid superfluous entries in RUNPATH as described
|
;; to avoid superfluous entries in RUNPATH as described
|
||||||
;; in <https://bugs.gnu.org/28444#46>, so armhf may now
|
;; in <https://bugs.gnu.org/28444#46>, so armhf may now
|
||||||
;; have different runtime dependencies from other arches.
|
;; have different runtime dependencies from other arches.
|
||||||
,@(if (not (string-prefix? "arm" (or (%current-target-system)
|
,@(if (not (target-arm32?))
|
||||||
(%current-system))))
|
|
||||||
`(("patchelf" ,(default-patchelf)))
|
`(("patchelf" ,(default-patchelf)))
|
||||||
'())
|
'())
|
||||||
,@native-inputs))
|
,@native-inputs))
|
||||||
|
@ -148,8 +147,7 @@ has a 'meson.build' file."
|
||||||
#:search-paths ',(map search-path-specification->sexp
|
#:search-paths ',(map search-path-specification->sexp
|
||||||
search-paths)
|
search-paths)
|
||||||
#:phases
|
#:phases
|
||||||
(if (string-prefix? "arm" ,(or (%current-target-system)
|
(if (target-arm32?)
|
||||||
(%current-system)))
|
|
||||||
(modify-phases build-phases (delete 'fix-runpath))
|
(modify-phases build-phases (delete 'fix-runpath))
|
||||||
build-phases)
|
build-phases)
|
||||||
#:configure-flags ,configure-flags
|
#:configure-flags ,configure-flags
|
||||||
|
|
Loading…
Reference in New Issue