diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-10-08 14:43:07 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-10-08 14:49:56 +0200 |
| commit | ccc2658e2a111590ec25e308946e47a24d357785 (patch) | |
| tree | eebc21a6c6729ce5a7d6147ef5f3beca3bac461f /guix/build-system/qt.scm | |
| parent | 857648a5e602e69cef011b9121acdfa5578b6c11 (diff) | |
build-system: Factorize 'strip' flags and directories.
Previously only 'gnu-build-system' would default to "--strip-unneeded",
since commit e0f31baacc6ad30096a332b69433c85f5830bb2c; most other build
systems would default to "--strip-debug".
This change brings consistency.
* guix/build-system/gnu.scm (%strip-flags, %strip-directories): Export.
* guix/build-system/cmake.scm (cmake-build, cmake-cross-build): Use them.
* guix/build-system/copy.scm (copy-build): Likewise.
* guix/build-system/dune.scm (dune-build): Likewise.
* guix/build-system/glib-or-gtk.scm (glib-or-gtk-build)
(glib-or-gtk-cross-build): Likewise.
* guix/build-system/maven.scm (maven-build): Likewise.
* guix/build-system/meson.scm (meson-build, meson-cross-build): Likewise.
* guix/build-system/ocaml.scm (ocaml-build): Likewise.
* guix/build-system/qt.scm (qt-build, qt-cross-build): Likewise.
Diffstat (limited to 'guix/build-system/qt.scm')
| -rw-r--r-- | guix/build-system/qt.scm | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/guix/build-system/qt.scm b/guix/build-system/qt.scm index a9bf728f25..ba5c84347a 100644 --- a/guix/build-system/qt.scm +++ b/guix/build-system/qt.scm @@ -135,9 +135,8 @@ (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) (phases '%standard-phases) (qt-wrap-excluded-outputs ''()) (qt-wrap-excluded-inputs %qt-wrap-excluded-inputs) @@ -208,10 +207,8 @@ provides a 'CMakeLists.txt' file as its build system." (validate-runpath? #t) (patch-shebangs? #t) (strip-binaries? #t) - (strip-flags ''("--strip-debug" - "--enable-deterministic-archives")) - (strip-directories ''("lib" "lib64" "libexec" - "bin" "sbin")) + (strip-flags %strip-flags) + (strip-directories %strip-directories) (phases '%standard-phases) (system (%current-system)) (build (nix-system->gnu-triplet system)) |