diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-06-09 11:58:43 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-06-09 11:58:43 +0200 |
| commit | 84e6756c5734cdfbb79f3b771e8d8fc8f773a795 (patch) | |
| tree | 38489ffb2d18d1f493aff3fd919f8c94994f5c02 /gnu/packages/base.scm | |
| parent | e0a0c84b4f1f1c78cdb444193654471c4971b63a (diff) | |
| download | patches-84e6756c5734cdfbb79f3b771e8d8fc8f773a795.tar patches-84e6756c5734cdfbb79f3b771e8d8fc8f773a795.tar.gz | |
gnu: gcc: Add a "lib" output.
* gnu/packages/gcc.scm (gcc-4.7)[configure-flags]: Add
--with-gxx-include-dir.
[outputs]: New field.
[arguments] <phases>: Adjust to use the "lib" output. Add
'substitute*' calls for "libstdc++-v3/python/Makefile.in" and
"gcc/config.in".
* gnu/packages/base.scm (gcc-boot0) <symlink-libgcc_eh>: Use the "lib"
output.
(cross-gcc-wrapper): Add 'outputs' field.
(glibc-final)[arguments]: Adjust #:allowed-references to list
'(GCC-BOOT0 "lib").
(libstdc++): Add 'outputs' field.
(gcc-final)[arguments]: Add "lib" to #:allowed-references.
* gnu/packages/make-bootstrap.scm (%gcc-static): Add 'outputs' field.
Diffstat (limited to 'gnu/packages/base.scm')
| -rw-r--r-- | gnu/packages/base.scm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 3ad2cf4ea0..499690f666 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -741,7 +741,7 @@ identifier SYSTEM." (alist-cons-after 'install 'symlink-libgcc_eh (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) + (let ((out (assoc-ref outputs "lib"))) ;; Glibc wants to link against libgcc_eh, so provide ;; it. (with-directory-excursion @@ -866,6 +866,7 @@ that makes it available under the native tool names." (name (string-append (package-name gcc) "-wrapped")) (source #f) (build-system trivial-build-system) + (outputs '("out")) (arguments `(#:guile ,%bootstrap-guile #:modules ((guix build utils)) @@ -941,7 +942,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; if 'allowed-references' were per-output. (arguments `(#:allowed-references - ,(cons* gcc-boot0 (linux-libre-headers-boot0) + ,(cons* `(,gcc-boot0 "lib") (linux-libre-headers-boot0) (package-outputs glibc-final-with-bootstrap-bash)) ,@(package-arguments glibc-final-with-bootstrap-bash))))) @@ -993,6 +994,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; "/include/c++/" ;; ,(package-version gcc-4.8) )))) + (outputs '("out")) (inputs %boot2-inputs) (native-inputs '()) (propagated-inputs '()) @@ -1007,7 +1009,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" `(#:guile ,%bootstrap-guile #:implicit-inputs? #f - #:allowed-references ("out" ,glibc-final) + #:allowed-references ("out" "lib" ,glibc-final) ;; Build again GMP & co. within GCC's build process, because it's hard ;; to do outside (because GCC-BOOT0 is a cross-compiler, and thus |