[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
197/211: Oops, libstdc++ build fixes WIP
From: |
Jan Nieuwenhuizen |
Subject: |
197/211: Oops, libstdc++ build fixes WIP |
Date: |
Sat, 8 Sep 2018 11:09:57 -0400 (EDT) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 10d0ef6b7c6c1649e508f69f64885f1fe3e9cf56
Author: Jan Nieuwenhuizen <address@hidden>
Date: Wed Sep 5 16:00:58 2018 +0200
Oops, libstdc++ build fixes WIP
* gnu/packages/commencement.scm (glibc-mesboot): Also add
C_PLUS_INCLUDE_PATH
to native search paths.
---
gnu/packages/commencement.scm | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 10e4030..4c8c832 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1249,7 +1249,6 @@ ac_cv_c_float_format='IEEE (little-endian)'
(source #f)
(inputs '())
(native-inputs `(("bash" ,%bootstrap-coreutils&co)
- ;;("libc" ,%bootstrap-glibc)
("libc" ,glibc-mesboot)
("gcc" ,gcc-mesboot)))
(arguments
@@ -1433,7 +1432,22 @@ exec " gcc "/bin/" program
(install-flags (cons "install" make-flags)))
(and (apply invoke "make" install-flags)
(copy-recursively kernel-headers out)
- #t))))))))))))
+ #t)))))))))
+ (native-search-paths ;; FIXME: move to glibc-mesboot0
+ ;; Use the language-specific variables rather than 'CPATH' because they
+ ;; are equivalent to '-isystem' whereas 'CPATH' is equivalent to '-I'.
+ ;; The intent is to allow headers that are in the search path to be
+ ;; treated as "system headers" (headers exempt from warnings) just like
+ ;; the typical /usr/include headers on an FHS system.
+ (list (search-path-specification
+ (variable "C_INCLUDE_PATH")
+ (files '("include")))
+ (search-path-specification
+ (variable "CPLUS_INCLUDE_PATH")
+ (files '("include")))
+ (search-path-specification
+ (variable "LIBRARY_PATH")
+ (files '("lib"))))))))
(define-public m4-mesboot
(package-with-bootstrap-guile
- 196/211: build: make %boot*-inputs a procedure., (continued)
- 196/211: build: make %boot*-inputs a procedure., Jan Nieuwenhuizen, 2018/09/08
- 210/211: gnu: nyacc-boot: Update to 0.86.0., Jan Nieuwenhuizen, 2018/09/08
- 206/211: gnu: m4-boot0: New variable., Jan Nieuwenhuizen, 2018/09/08
- 201/211: gnu: file-boot0: Remove bootstrap leaks., Jan Nieuwenhuizen, 2018/09/08
- 204/211: gnu: gcc-boot0: Workaround libtool install bug., Jan Nieuwenhuizen, 2018/09/08
- 203/211: gnu: glibc-mesboot: Drop obsolete sun rpc support., Jan Nieuwenhuizen, 2018/09/08
- 208/211: gnu: nyacc: Update to 0.86.0., Jan Nieuwenhuizen, 2018/09/08
- 199/211: gnu: diffutils-boot0: Remove bootstrap leaks., Jan Nieuwenhuizen, 2018/09/08
- 183/211: gnu: gcc-core-mesboot: Cleanup., Jan Nieuwenhuizen, 2018/09/08
- 205/211: gnu: perl-boot0: Remove bootstrap leaks., Jan Nieuwenhuizen, 2018/09/08
- 197/211: Oops, libstdc++ build fixes WIP,
Jan Nieuwenhuizen <=
- 177/211: gnu: mes-boot: Cleanup., Jan Nieuwenhuizen, 2018/09/08
- 190/211: gnu: gcc-mesboot: Cleanup., Jan Nieuwenhuizen, 2018/09/08
- 180/211: gnu: make-mesboot0: Cleanup., Jan Nieuwenhuizen, 2018/09/08
- 181/211: gnu: diffutils-mesboot: Cleanup., Jan Nieuwenhuizen, 2018/09/08
- 162/211: gnu: Add glibc-mesboot 2.3.6. WIP, Jan Nieuwenhuizen, 2018/09/08
- 185/211: gnu: glibc-mesboot0: Cleanup., Jan Nieuwenhuizen, 2018/09/08
- 207/211: gnu: bison-boot0: Remove bootstrap leaks., Jan Nieuwenhuizen, 2018/09/08
- 193/211: gnu: glibc-mesboot: Oops, install everything., Jan Nieuwenhuizen, 2018/09/08
- 189/211: gnu: make-mesboot: Cleanup., Jan Nieuwenhuizen, 2018/09/08
- 172/211: copy-linux-headers: Update for glibc-2.16.0., Jan Nieuwenhuizen, 2018/09/08