diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-03-21 22:16:02 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-21 22:16:02 +0100 |
commit | d19b14c8349ce8cacb62619ab68953265daeeca7 (patch) | |
tree | 9aacc6f9378ca69951c87232b3a7526fef2f2054 /gnu/packages/gcc.scm | |
parent | 680b56116a4840a281a45cb130fd45d6d3d46c56 (diff) | |
parent | ee4c927f33a1d3b01cf36be3c74227f6b7fd69ff (diff) | |
download | guix-d19b14c8349ce8cacb62619ab68953265daeeca7.tar.gz guix-d19b14c8349ce8cacb62619ab68953265daeeca7.zip |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/gcc.scm')
-rw-r--r-- | gnu/packages/gcc.scm | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index f465470d49..5c5c51a0ad 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020 Joseph LaFreniere <joseph@lafreniere.xyz> +;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -605,26 +606,22 @@ using compilers other than GCC." #:phases (modify-phases %standard-phases (add-before 'configure 'chdir - (lambda _ - (chdir "libiberty") - #t)) - (replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (lib (string-append out "/lib/")) - (include (string-append out "/include/"))) - (mkdir-p lib) - (mkdir-p include) - (copy-file "libiberty.a" - (string-append lib "libiberty.a")) - (copy-file "../include/libiberty.h" - (string-append include "libiberty.h")) - #t)))))) + (lambda _ + (chdir "libiberty") + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib/")) + (include (string-append out "/include/"))) + (install-file "libiberty.a" lib) + (install-file "../include/libiberty.h" include)) + #t))))) (inputs '()) (outputs '("out")) (native-inputs '()) (propagated-inputs '()) + (properties '()) (synopsis "Collection of subroutines used by various GNU programs"))) (define-public libiberty |