guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/02: build-system/gnu: Use the long option name for deterministic arch


From: Ludovic Courtès
Subject: 01/02: build-system/gnu: Use the long option name for deterministic archives.
Date: Fri, 01 Jan 2016 00:05:25 +0000

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

commit 7165a91c7dc59561d4c4f338102f32fdab1486a6
Author: Ludovic Courtès <address@hidden>
Date:   Fri Jan 1 00:49:05 2016 +0100

    build-system/gnu: Use the long option name for deterministic archives.
    
    This is a followup to 3eb34c6.
    
    * guix/build-system/gnu.scm (gnu-build, gnu-cross-build): Use
    "--enable-deterministic-archives" instead of "-D" to work around
    Binutils bug <https://sourceware.org/bugzilla/show_bug.cgi?id=17671>.
    * guix/build/gnu-build-system.scm (strip): Likewise.
---
 guix/build-system/gnu.scm       |    8 +++++---
 guix/build/gnu-build-system.scm |    7 ++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index 9fd25d7..c77348b 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <address@hidden>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -282,7 +282,8 @@ standard packages used as implicit inputs of the GNU build 
system."
                     (parallel-tests? #t)
                     (patch-shebangs? #t)
                     (strip-binaries? #t)
-                    (strip-flags ''("--strip-debug" "-D"))
+                    (strip-flags ''("--strip-debug"
+                                    "--enable-deterministic-archives"))
                     (strip-directories ''("lib" "lib64" "libexec"
                                           "bin" "sbin"))
                     (validate-runpath? #t)
@@ -417,7 +418,8 @@ is one of `host' or `target'."
                           (parallel-build? #t) (parallel-tests? #t)
                           (patch-shebangs? #t)
                           (strip-binaries? #t)
-                          (strip-flags ''("--strip-debug" "-D"))
+                          (strip-flags ''("--strip-debug"
+                                          "--enable-deterministic-archives"))
                           (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 13f925e..e168b6c 100644
--- a/guix/build/gnu-build-system.scm
+++ b/guix/build/gnu-build-system.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <address@hidden>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -329,7 +329,8 @@ makefiles."
                 (objcopy-command (if target
                                      (string-append target "-objcopy")
                                      "objcopy"))
-                (strip-flags '("--strip-debug" "-D"))
+                (strip-flags '("--strip-debug"
+                               "--enable-deterministic-archives"))
                 (strip-directories '("lib" "lib64" "libexec"
                                      "bin" "sbin"))
                 #:allow-other-keys)
@@ -367,7 +368,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 "-D"
+    (zero? (system* objcopy-command "--enable-deterministic-archives"
                     (string-append "--add-gnu-debuglink="
                                    (debug-file file))
                     file)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]