nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:
Efraim Flashner 2018-03-19 22:06:22 +02:00
parent a53f4311a1
commit 3a7597e414
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
guix/build-system/meson.scm
View File

@ -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