From patchwork Fri Jun 21 12:26:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 14364 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 352141712C; Fri, 21 Jun 2019 13:27:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 8B23017120 for ; Fri, 21 Jun 2019 13:27:21 +0100 (BST) Received: from localhost ([::1]:60974 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1heIdU-0005KO-JW for patchwork@mira.cbaines.net; Fri, 21 Jun 2019 08:27:20 -0400 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 X-Loop: help-debbugs@gnu.org Subject: [bug#36322] [PATCH 3/4] gnu: make-bootstrap: Adjust for GCC 7. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Jun 2019 12:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36322 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36322@debbugs.gnu.org Received: via spool by 36322-submit@debbugs.gnu.org id=B36322.156112000526512 (code B ref 36322); Fri, 21 Jun 2019 12:27:02 +0000 Received: (at 36322) by debbugs.gnu.org; 21 Jun 2019 12:26:45 +0000 Received: from localhost ([127.0.0.1]:49874 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1heIcv-0006tX-0m for submit@debbugs.gnu.org; Fri, 21 Jun 2019 08:26:45 -0400 Received: from wout3-smtp.messagingengine.com ([64.147.123.19]:60253) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1heIcq-0006sj-2I for 36322@debbugs.gnu.org; Fri, 21 Jun 2019 08:26:42 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 8A49E35D for <36322@debbugs.gnu.org>; Fri, 21 Jun 2019 08:26:34 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Fri, 21 Jun 2019 08:26:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm3; bh=4myvFwGsMVVbq zJPk7j8g84zXZy585Ssc9GRmAuZKGM=; b=gxCxZqs9Rr0QtqQXepwCTv6nnCt7b WQOrf6odBkpVfQvZi36lKWG0/1YFesB/ldSosCz5alm/glyt4Xkh2eevYK/29lkZ QsIdR2DHWI1gYsNAL6MfAsQQwq+vvr5+ZKNQPLOjqk86nsnnF8h5qDUOEnPdzqLm BTVrjL4qRiD/9jiKiZu8lyYzg2bTBSCWfqTat0tHJdJFTOUlsT66jPsUycRCL95/ 8ekq9U59RFdtTvwOmjrSKJqe7v3+8oiapuHZhqqX8RvqTwgbEe1T5Dt2uo43bRoM xR5BTL+WYQ2XB7DNgGuZHUDQtRFSMpO3dfAlYIxau0rST4aRsQ3DrkqAw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=4myvFwGsMVVbqzJPk7j8g84zXZy585Ssc9GRmAuZKGM=; b=EaUc7cNP 1tNhqAEv4dqmnHh8hM44CvpnTuSRZtX+ImSUx3lLRsjg9S9U9oTKPbI8CRaMKRMo MBLcw4hX43rWJkizv5DVwawG06ZCT6cHooVTDeTOH/4Fpzlf66Q7rAzxKT2hglwA K+WUJ6vtjbPq/yBTYnMww/wm6o7gmbiOfEaoBXkUamUoSK74fHDTO2xLvrsbs0sU Iu3GcAsvu9W7ob2uiQ/BQDO/vfDF5oh7yEz8yh3cRapWirvkfk2tnR2lY8+KtMGJ vcMDpcASPkksz82iaVz9jyxw4pcG62E/VqmEaXIgPZr92XuCcOHx3CQQTuO0CWsa m2tMvekm5gQJGQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddrtdeigdehhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpeforghrihhushcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshht mhgrihhlrdgtohhmqeenucfkphepiedvrdduiedrvddviedrudegtdenucfrrghrrghmpe hmrghilhhfrhhomhepmhgsrghkkhgvsehfrghsthhmrghilhdrtghomhenucevlhhushht vghrufhiiigvpedt X-ME-Proxy: Received: from localhost (140.226.16.62.customer.cdi.no [62.16.226.140]) by mail.messagingengine.com (Postfix) with ESMTPA id 88A17380087 for <36322@debbugs.gnu.org>; Fri, 21 Jun 2019 08:26:33 -0400 (EDT) From: Marius Bakke Date: Fri, 21 Jun 2019 14:26:27 +0200 Message-Id: <20190621122628.18174-3-mbakke@fastmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190621122628.18174-1-mbakke@fastmail.com> References: <20190621122628.18174-1-mbakke@fastmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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))