diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-12-29 21:44:48 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-12-29 21:54:12 +0100 |
| commit | 7da473b75721e06237b106c6d186f2729117b1ee (patch) | |
| tree | 51590bf15e86eb469dfe640b5532cc2cd6b14708 /guix | |
| parent | f05bdc9412135f34a1c417edc203c35cd005d0d5 (diff) | |
gnu: Revert use of '--strip-all'.
This reverts commits f05bdc9412135f34a1c417edc203c35cd005d0d5
and 856ae5e6c71a1283a414d33e638051f95d3cce35.
This broke all sorts of things. See <http://hydra.gnu.org/eval/102058>,
for example.
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/build-system/gnu.scm | 4 | ||||
| -rw-r--r-- | guix/build/gnu-build-system.scm | 13 |
2 files changed, 3 insertions, 14 deletions
diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index e2b41b1898..c675155a6a 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -274,8 +274,7 @@ standard packages used as implicit inputs of the GNU build system." (parallel-tests? #t) (patch-shebangs? #t) (strip-binaries? #t) - (strip-flags ''("--strip-all")) - (archive-strip-flags ''("--strip-debug")) + (strip-flags ''("--strip-debug")) (strip-directories ''("lib" "lib64" "libexec" "bin" "sbin")) (phases '%standard-phases) @@ -339,7 +338,6 @@ are allowed to refer to." #:patch-shebangs? ,patch-shebangs? #:strip-binaries? ,strip-binaries? #:strip-flags ,strip-flags - #:archive-strip-flags ,archive-strip-flags #:strip-directories ,strip-directories))) (define guile-for-build diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index a985b1c715..1311cdcc9a 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -297,13 +297,7 @@ makefiles." (objcopy-command (if target (string-append target "-objcopy") "objcopy")) - (strip-flags '("--strip-all")) - - ;; Using '--strip-all' on .a file would remove the archive - ;; index, leading to "Archive has no index" errors when - ;; linking against them. - (archive-strip-flags '("--strip-debug")) - + (strip-flags '("--strip-debug")) (strip-directories '("lib" "lib64" "libexec" "bin" "sbin")) #:allow-other-keys) @@ -359,10 +353,7 @@ makefiles." (or (not debug-output) (make-debug-file path)) (zero? (apply system* strip-command - (append (if (ar-file? path) - archive-strip-flags - strip-flags) - (list path)))) + (append strip-flags (list path)))) (or (not debug-output) (add-debug-link path)))) (const #t) ; down |