From patchwork Thu Dec 9 22:18:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Lance Taylor X-Patchwork-Id: 75001 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id 7D2F3B6EF1 for ; Fri, 10 Dec 2010 09:18:51 +1100 (EST) Received: (qmail 21604 invoked by alias); 9 Dec 2010 22:18:46 -0000 Received: (qmail 21589 invoked by uid 22791); 9 Dec 2010 22:18:44 -0000 X-SWARE-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, SPF_HELO_PASS, TW_CC, T_RP_MATCHES_RCVD, T_TVD_MIME_NO_HEADERS X-Spam-Check-By: sourceware.org Received: from smtp-out.google.com (HELO smtp-out.google.com) (216.239.44.51) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 09 Dec 2010 22:18:39 +0000 Received: from hpaq12.eem.corp.google.com (hpaq12.eem.corp.google.com [172.25.149.12]) by smtp-out.google.com with ESMTP id oB9MIbZY019773 for ; Thu, 9 Dec 2010 14:18:37 -0800 Received: from pzk6 (pzk6.prod.google.com [10.243.19.134]) by hpaq12.eem.corp.google.com with ESMTP id oB9MIC2h031015 for ; Thu, 9 Dec 2010 14:18:35 -0800 Received: by pzk6 with SMTP id 6so20552pzk.5 for ; Thu, 09 Dec 2010 14:18:35 -0800 (PST) Received: by 10.142.215.15 with SMTP id n15mr4599544wfg.77.1291933115304; Thu, 09 Dec 2010 14:18:35 -0800 (PST) Received: from coign.google.com ([216.239.45.130]) by mx.google.com with ESMTPS id x18sm3063288wfa.11.2010.12.09.14.18.33 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 09 Dec 2010 14:18:34 -0800 (PST) From: Ian Lance Taylor To: gcc-patches@gcc.gnu.org, gofrontend-dev@googlegroups.com Subject: libgo patch committed: Add explicit -I when building libgo Date: Thu, 09 Dec 2010 14:18:31 -0800 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) MIME-Version: 1.0 X-System-Of-Record: true X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org In another attempt to fix PR 46812, this patch adds an explicit -I option when building libgo, so that while building gccgo should include the local packages first. Committed to mainline. Ian diff -r d2f4dee3cf22 libgo/Makefile.am --- a/libgo/Makefile.am Tue Dec 07 18:07:38 2010 -0800 +++ b/libgo/Makefile.am Thu Dec 09 14:15:03 2010 -0800 @@ -1291,7 +1291,7 @@ test -d $(@D) || $(MKDIR_P) $(@D); \ rm -f $@; \ files=`echo $^ | sed -e 's/[^ ]*\.gox//g'`; \ - if $(LTGOCOMPILE) -c -fgo-prefix="libgo_$(@D)" -o $@.$(OBJEXT) $$files; then \ + if $(LTGOCOMPILE) -I . -c -fgo-prefix="libgo_$(@D)" -o $@.$(OBJEXT) $$files; then \ $(AR) rc $@ $@.$(OBJEXT); \ else exit 1; fi