[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
197/210: Oops, libstdc++ build fixes WIP
From: |
Jan Nieuwenhuizen |
Subject: |
197/210: Oops, libstdc++ build fixes WIP |
Date: |
Sat, 8 Sep 2018 10:36:34 -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
- 189/210: gnu: make-mesboot: Cleanup., (continued)
- 189/210: gnu: make-mesboot: Cleanup., Jan Nieuwenhuizen, 2018/09/08
- 194/210: oops: fixup glibc-bootstrap-system-2.16.0.patch name., Jan Nieuwenhuizen, 2018/09/08
- 209/210: gnu: nyacc-boot: Update to 0.86.0., Jan Nieuwenhuizen, 2018/09/08
- 203/210: gnu: glibc-mesboot: Drop obsolete sun rpc support., Jan Nieuwenhuizen, 2018/09/08
- 192/210: gnu: glibc-mesboot: Cleanup., Jan Nieuwenhuizen, 2018/09/08
- 210/210: gnu: mes-boot0: Support Nyacc 0.86.0., Jan Nieuwenhuizen, 2018/09/08
- 200/210: gnu: findutils-boot0: Remove bootstrap leaks., Jan Nieuwenhuizen, 2018/09/08
- 191/210: gnu: glibc-headers-mesboot: Cleanup., Jan Nieuwenhuizen, 2018/09/08
- 195/210: glibc-mesboot: do not validate runpath, Jan Nieuwenhuizen, 2018/09/08
- 184/210: gnu: mesboot-headers: Cleanup., Jan Nieuwenhuizen, 2018/09/08
- 197/210: Oops, libstdc++ build fixes WIP,
Jan Nieuwenhuizen <=
- 175/210: gnu: glibc-mesboot: Remove %bootstrap-glibc., Jan Nieuwenhuizen, 2018/09/08
- 170/210: gnu: make-mesboot: Update to 3.82., Jan Nieuwenhuizen, 2018/09/08
- 178/210: gnu: tcc-boot0: Cleanup., Jan Nieuwenhuizen, 2018/09/08
- 179/210: gnu: tcc-boot: Cleanup., Jan Nieuwenhuizen, 2018/09/08
- 173/210: gnu: Add mesboot-headers., Jan Nieuwenhuizen, 2018/09/08
- 169/210: bootstrap: Evaluate %bootstrap-inputs+toolchain at build time., Jan Nieuwenhuizen, 2018/09/08
- 166/210: gnu: file-boot0: Do not strip binaries or validate-runpath., Jan Nieuwenhuizen, 2018/09/08
- 198/210: gnu: Add gcc-mesboot-4.9.4., Jan Nieuwenhuizen, 2018/09/08
- 145/210: bootstrap: Integrate mes bootstrap for i686-linux., Jan Nieuwenhuizen, 2018/09/08
- 66/210: gnu: binutils-boot: Update to 2.30., Jan Nieuwenhuizen, 2018/09/08