me/guix
Archived
1
0
Fork 0
Code Activity

build-system/meson: Allow 'configure-flags' to be a G-exp.

Browse source 
* guix/build-system/meson.scm
  (meson-build, meson-cross-build): Only call 'sexp->gexp' on
  'configure-flags' when 'configure-flags' is a pair.
This commit is contained in:
Maxime Devos 2021-08-24 11:03:25 +02:00 • committed by Mathieu Othacehe
parent c3db377d2b
commit fa81c31ce9
No known key found for this signature in database
GPG key ID: 8354763531769CA6
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
guix/build-system/meson.scm
View file

@ -212,7 +212,10 @@ has a 'meson.build' file."
(map search-path-specification->sexp (map search-path-specification->sexp
search-paths)) search-paths))
#:phases build-phases #:phases build-phases
#:configure-flags #$(sexp->gexp configure-flags) #:configure-flags
#$(if (pair? configure-flags)
(sexp->gexp configure-flags)
configure-flags)
#:build-type #$build-type #:build-type #$build-type
#:tests? #$tests? #:tests? #$tests?
#:test-target #$test-target #:test-target #$test-target
@ -309,7 +312,9 @@ SOURCE has a 'meson.build' file."
#:phases build-phases #:phases build-phases
#:make-dynamic-linker-cache? #$make-dynamic-linker-cache? #:make-dynamic-linker-cache? #$make-dynamic-linker-cache?
#:configure-flags `("--cross-file" #+cross-file #:configure-flags `("--cross-file" #+cross-file
,@#$(sexp->gexp configure-flags)) ,@#$(if (pair? configure-flags)
(sexp->gexp configure-flags)
configure-flags))
#:build-type #$build-type #:build-type #$build-type
#:tests? #$tests? #:tests? #$tests?
#:test-target #$test-target #:test-target #$test-target