diff options
Diffstat (limited to 'guix/build-system/meson.scm')
-rw-r--r-- | guix/build-system/meson.scm | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index b0bf8cb6e6..0948ad92b5 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com> ;;; Copyright © 2018, 2019 Marius Bakke <mbakke@fastmail.com> -;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2021, 2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> ;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il> ;;; @@ -181,9 +181,8 @@ TRIPLET." (validate-runpath? #t) (patch-shebangs? #t) (strip-binaries? #t) - (strip-flags ''("--strip-debug")) - (strip-directories ''("lib" "lib64" "libexec" - "bin" "sbin")) + (strip-flags %strip-flags) + (strip-directories %strip-directories) (elf-directories ''("lib" "lib64" "libexec" "bin" "sbin")) (phases '%standard-phases) @@ -229,8 +228,8 @@ has a 'meson.build' file." #:validate-runpath? #$validate-runpath? #:patch-shebangs? #$patch-shebangs? #:strip-binaries? #$strip-binaries? - #:strip-flags #$(sexp->gexp strip-flags) - #:strip-directories #$(sexp->gexp strip-directories) + #:strip-flags #$strip-flags + #:strip-directories #$strip-directories #:elf-directories #$(sexp->gexp elf-directories)))))) (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) @@ -263,9 +262,8 @@ has a 'meson.build' file." (validate-runpath? #t) (patch-shebangs? #t) (strip-binaries? #t) - (strip-flags ''("--strip-debug")) - (strip-directories ''("lib" "lib64" "libexec" - "bin" "sbin")) + (strip-flags %strip-flags) + (strip-directories %strip-directories) (elf-directories ''("lib" "lib64" "libexec" "bin" "sbin")) ;; See 'gnu-cross-build' for why this needs to be @@ -342,8 +340,8 @@ SOURCE has a 'meson.build' file." #:validate-runpath? #$validate-runpath? #:patch-shebangs? #$patch-shebangs? #:strip-binaries? #$strip-binaries? - #:strip-flags #$(sexp->gexp strip-flags) - #:strip-directories #$(sexp->gexp strip-directories) + #:strip-flags #$strip-flags + #:strip-directories #$strip-directories #:elf-directories #$(sexp->gexp elf-directories))))) (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) |