build-system/meson: Allow 'configure-flags' to be a G-exp.
* 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:
parent
c3db377d2b
commit
fa81c31ce9
@ -212,7 +212,10 @@ has a 'meson.build' file."
|
||||
(map search-path-specification->sexp
|
||||
search-paths))
|
||||
#: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
|
||||
#:tests? #$tests?
|
||||
#:test-target #$test-target
|
||||
@ -309,7 +312,9 @@ SOURCE has a 'meson.build' file."
|
||||
#:phases build-phases
|
||||
#:make-dynamic-linker-cache? #$make-dynamic-linker-cache?
|
||||
#:configure-flags `("--cross-file" #+cross-file
|
||||
,@#$(sexp->gexp configure-flags))
|
||||
,@#$(if (pair? configure-flags)
|
||||
(sexp->gexp configure-flags)
|
||||
configure-flags))
|
||||
#:build-type #$build-type
|
||||
#:tests? #$tests?
|
||||
#:test-target #$test-target
|
||||
|
Loading…
Reference in New Issue
Block a user