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

build-system/meson: Really skip the 'fix-runpath' phase on armhf. 

This follows up commit d5b5a15a40 which doesn't
work because %current-system etc expands before the actual build.

Fixes <https://bugs.gnu.org/31719>.

* guix/build-system/meson.scm (meson-build)[builder]: Compare against the
already existing "system" variable rather than (%current-system).
This commit is contained in:
Marius Bakke 2018-07-02 12:07:58 +02:00
parent fa41a089a1
commit cb4b508cd6
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -148,8 +148,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 (string-prefix? "arm" ,system)
(%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