06/07: build-system/gnu: Always pass "-D" to strip/objcopy.

[Ludovic Courtès]

civodul pushed a commit to branch core-updates
in repository guix.

commit 3eb34c631a143d77bf11bff2363a76959e45aa50
Author: Ludovic Courtès <address@hidden>
Date:   Fri Dec 18 23:58:51 2015 +0100

    build-system/gnu: Always pass "-D" to strip/objcopy.
    
    * guix/build-system/gnu.scm (gnu-build, gnu-cross-build): Add "-D" to
      #:strip-flags.
    * guix/build/gnu-build-system.scm (strip): Likewise.  Also pass "-D" to
      OBJCOPY-COMMAND.
---
 guix/build-system/gnu.scm       |    4 ++--
 guix/build/gnu-build-system.scm |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index c83c50b..9fd25d7 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -282,7 +282,7 @@ standard packages used as implicit inputs of the GNU build 
system."
                     (parallel-tests? #t)
                     (patch-shebangs? #t)
                     (strip-binaries? #t)
-                    (strip-flags ''("--strip-debug"))
+                    (strip-flags ''("--strip-debug" "-D"))
                     (strip-directories ''("lib" "lib64" "libexec"
                                           "bin" "sbin"))
                     (validate-runpath? #t)
@@ -417,7 +417,7 @@ is one of `host' or `target'."
                           (parallel-build? #t) (parallel-tests? #t)
                           (patch-shebangs? #t)
                           (strip-binaries? #t)
-                          (strip-flags ''("--strip-debug"))
+                          (strip-flags ''("--strip-debug" "-D"))
                           (strip-directories ''("lib" "lib64" "libexec"
                                                 "bin" "sbin"))
                           (validate-runpath? #t)
diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm
index 92e15d1..13f925e 100644
--- a/guix/build/gnu-build-system.scm
+++ b/guix/build/gnu-build-system.scm
@@ -329,7 +329,7 @@ makefiles."
                 (objcopy-command (if target
                                      (string-append target "-objcopy")
                                      "objcopy"))
-                (strip-flags '("--strip-debug"))
+                (strip-flags '("--strip-debug" "-D"))
                 (strip-directories '("lib" "lib64" "libexec"
                                      "bin" "sbin"))
                 #:allow-other-keys)
@@ -367,7 +367,7 @@ makefiles."
     ;; `bfd_fill_in_gnu_debuglink_section' function.)  No reference to
     ;; DEBUG-OUTPUT is kept because bfd keeps only the basename of the debug
     ;; file.
-    (zero? (system* objcopy-command
+    (zero? (system* objcopy-command "-D"
                     (string-append "--add-gnu-debuglink="
                                    (debug-file file))
                     file)))