diff options
| author | Mathieu Othacehe <othacehe@gnu.org> | 2021-09-22 06:25:20 +0000 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-09-22 06:25:20 +0000 |
| commit | 0cccc2f52cedd9b0e0646cc4d3ae64a886f2db6b (patch) | |
| tree | d9724175476a27a7234140519e035c8d4c79aedc /guix/build-system/meson.scm | |
| parent | 22f7d4bce1e694b7ac38e62410d76a6d46d96c5d (diff) | |
| parent | d58e52b0713648dd30d41b41277854a935d8d15a (diff) | |
Merge remote-tracking branch core-updates-frozen into core-updates
Diffstat (limited to 'guix/build-system/meson.scm')
| -rw-r--r-- | guix/build-system/meson.scm | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index dae0abde94..dcad3f322d 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -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 |