From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:35169) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1heIdH-0005IV-Bi for guix-patches@gnu.org; Fri, 21 Jun 2019 08:27:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1heIdE-0005e0-20 for guix-patches@gnu.org; Fri, 21 Jun 2019 08:27:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36334) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1heIdC-0005b1-TZ for guix-patches@gnu.org; Fri, 21 Jun 2019 08:27:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1heIdC-0006uO-Ol for guix-patches@gnu.org; Fri, 21 Jun 2019 08:27:02 -0400 Subject: [bug#36322] [PATCH 3/4] gnu: make-bootstrap: Adjust for GCC 7. Resent-Message-ID: From: Marius Bakke Date: Fri, 21 Jun 2019 14:26:27 +0200 Message-Id: <20190621122628.18174-3-mbakke@fastmail.com> In-Reply-To: <20190621122628.18174-1-mbakke@fastmail.com> References: <20190621122628.18174-1-mbakke@fastmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 36322@debbugs.gnu.org * gnu/packages/make-bootstrap.scm (package-with-relocatable-glibc)[native-inputs]: Add SEARCH-PATHS to CROSS-GCC, and NATIVE-SEARCH-PATHS to the native GCC. --- gnu/packages/make-bootstrap.scm | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 561a286d26..df6b828a2d 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -106,16 +106,33 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (define (native-inputs) (if (%current-target-system) - (let ((target (%current-target-system))) - `(("cross-gcc" ,(cross-gcc target - #:xbinutils (cross-binutils target) - #:libc (cross-bootstrap-libc))) + (let* ((target (%current-target-system)) + (xgcc (cross-gcc + target + #:xbinutils (cross-binutils target) + #:libc (cross-bootstrap-libc)))) + `(("cross-gcc" ,(package + (inherit xgcc) + (search-paths + ;; Ensure the cross libc headers appears on the + ;; C++ system header search path. + (cons (search-path-specification + (variable "CROSS_CPLUS_INCLUDE_PATH") + (files '("include"))) + (package-search-paths gcc))))) ("cross-binutils" ,(cross-binutils target)) ,@(%final-inputs))) `(("libc" ,(glibc-for-bootstrap)) ("libc:static" ,(glibc-for-bootstrap) "static") ("gcc" ,(package (inherit gcc) (outputs '("out")) ;all in one so libgcc_s is easily found + (native-search-paths + ;; Set CPLUS_INCLUDE_PATH so GCC is able to find the libc + ;; C++ headers. + (cons (search-path-specification + (variable "CPLUS_INCLUDE_PATH") + (files '("include"))) + (package-native-search-paths gcc))) (inputs `(;; Distinguish the name so we can refer to it below. ("bootstrap-libc" ,(glibc-for-bootstrap)) -- 2.22.0