From mboxrd@z Thu Jan 1 00:00:00 1970 From: Danny Milosavljevic Subject: bug#24416: [PATCH] gnu: avr-gcc: Fix compiler lookup paths. Date: Fri, 22 Dec 2017 15:45:40 +0100 Message-ID: <20171222154540.1444b5e6@scratchpost.org> References: Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:34645) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eSOaL-0004q3-TA for bug-guix@gnu.org; Fri, 22 Dec 2017 09:46:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eSOaI-0001St-Np for bug-guix@gnu.org; Fri, 22 Dec 2017 09:46:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:38417) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eSOaI-0001Rb-K1 for bug-guix@gnu.org; Fri, 22 Dec 2017 09:46:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eSOaI-0005sl-DE for bug-guix@gnu.org; Fri, 22 Dec 2017 09:46:02 -0500 Sender: "Debbugs-submit" Resent-Message-ID: In-Reply-To: List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: "bug-Guix" To: "Thompson, David" Cc: 24416@debbugs.gnu.org * gnu/packages/avr.scm (avr-gcc-4.9): Use CROSS_C*_INCLUDE_PATH (like cross-base does). (avr-gcc-5)[source]: Apply patch "gcc-cross-environment-variables.patch". --- gnu/packages/avr.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/gnu/packages/avr.scm b/gnu/packages/avr.scm index ecb7cd19a..60bcbe754 100644 --- a/gnu/packages/avr.scm +++ b/gnu/packages/avr.scm @@ -61,7 +61,16 @@ `(delete "--disable-multilib" ,flags)))) (native-search-paths (list (search-path-specification - (variable "CROSS_CPATH") + (variable "CROSS_C_INCLUDE_PATH") + (files '("avr/include"))) + (search-path-specification + (variable "CROSS_CPLUS_INCLUDE_PATH") + (files '("avr/include"))) + (search-path-specification + (variable "CROSS_OBJC_INCLUDE_PATH") + (files '("avr/include"))) + (search-path-specification + (variable "CROSS_OBJCPLUS_INCLUDE_PATH") (files '("avr/include"))) (search-path-specification (variable "CROSS_LIBRARY_PATH") @@ -71,7 +80,10 @@ (package (inherit avr-gcc-4.9) (version (package-version gcc-5)) - (source (package-source gcc-5)))) + (source (origin + (inherit (package-source gcc-5)) + (patches (append (origin-patches (package-source gcc-5)) + (search-patches "gcc-cross-environment-variables.patch"))))))) (define (avr-libc avr-gcc) (package