From owner-freebsd-toolchain@FreeBSD.ORG  Thu Mar 26 08:12:48 2015
Return-Path: <owner-freebsd-toolchain@FreeBSD.ORG>
Delivered-To: freebsd-toolchain@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 14E7B2F4;
 Thu, 26 Mar 2015 08:12:48 +0000 (UTC)
Received: from mail-la0-x233.google.com (mail-la0-x233.google.com
 [IPv6:2a00:1450:4010:c03::233])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 82AEFF4A;
 Thu, 26 Mar 2015 08:12:47 +0000 (UTC)
Received: by labe2 with SMTP id e2so39198737lab.3;
 Thu, 26 Mar 2015 01:12:45 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:date:message-id:subject
 :from:to:cc:content-type;
 bh=gMMvSyGSI7z+Zoabnwo8vrQpsmZxvQDjgP0SGRYGM7Q=;
 b=bh0fC3q5g2p03B0TmX/KI9L6Ad7AZfawrSxKjOJWzEBzEUygJKtFejIVMoeaZKGzMJ
 4T5yIIaYBynTXeNWO9bkijsijsuvATE5n/M9xRm7okkciONmOyP2wDAZmmCl54de8Rog
 Ao3SRFAyyjJFEXUD1L98rPUwZsRVRU/ppjnwYtKAKs4c/iIfutUEdgNfmrZqn+cSpogN
 XYzauWBaJP7mCQXERVQICdTi8QytWqR37QxDt+AvoBBZaUR5d1frO1kiz8DhdPXz159m
 Fa5pdOtp04AvTNDtIIw4P/mj056IQkmcuMUA4HLUSM7cqYpPHHHjE8BugPVLIsMTD3G/
 GepQ==
MIME-Version: 1.0
X-Received: by 10.152.6.71 with SMTP id y7mr12071184lay.116.1427357565563;
 Thu, 26 Mar 2015 01:12:45 -0700 (PDT)
Sender: crodr001@gmail.com
Received: by 10.112.108.168 with HTTP; Thu, 26 Mar 2015 01:12:45 -0700 (PDT)
In-Reply-To: <B768CFD8-FDC1-48EF-91C3-92056F90EE02@bsdimp.com>
References: <CAG=rPVfP4=BuL8DOuy9FNDcN51zshfBfeuFONiAAONWON6n3kA@mail.gmail.com>
 <A1580F95-4882-46F3-96C2-3D3D1D493706@FreeBSD.org>
 <CAG=rPVd9deshQWvMXOHF+yfvqZfo3UOsao9iqipX_CQGKs=vHA@mail.gmail.com>
 <1857A2A3-0C19-4F52-BCAF-6C72FE7D8DF3@FreeBSD.org>
 <CAG=rPVfKTi5cFyhNBg7pSYi_rUoEw2d8NeqA89Fy+iLxZt86hg@mail.gmail.com>
 <C3173614-08B4-4616-BD76-93CA8417A044@FreeBSD.org>
 <CAG=rPVc=YxuakeyFL9SXAnas3e9QyozfLqC2uQ_KhkqaavRvNQ@mail.gmail.com>
 <B768CFD8-FDC1-48EF-91C3-92056F90EE02@bsdimp.com>
Date: Thu, 26 Mar 2015 01:12:45 -0700
X-Google-Sender-Auth: 60bBjmpzhI5JM2RKs5w61nHOFNY
Message-ID: <CAG=rPVfC+oVr35Ayp_gudkGXctYprpxW2D7tj+T3tOOh=OyLpg@mail.gmail.com>
Subject: Re: Failed to build with external toolchain
From: Craig Rodrigues <rodrigc@FreeBSD.org>
To: Warner Losh <imp@bsdimp.com>
Content-Type: text/plain; charset=ISO-8859-1
X-Content-Filtered-By: Mailman/MimeDel 2.1.18-1
Cc: "freebsd-testing@freebsd.org" <freebsd-testing@freebsd.org>,
 freebsd-toolchain@freebsd.org
X-BeenThere: freebsd-toolchain@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: Maintenance of FreeBSD's integrated toolchain
 <freebsd-toolchain.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-toolchain>, 
 <mailto:freebsd-toolchain-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-toolchain/>
List-Post: <mailto:freebsd-toolchain@freebsd.org>
List-Help: <mailto:freebsd-toolchain-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-toolchain>, 
 <mailto:freebsd-toolchain-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Mar 2015 08:12:48 -0000

On Tue, Mar 24, 2015 at 8:39 PM, Warner Losh <imp@bsdimp.com> wrote:

>
>
> No. The in-tree gcc doesn't grok --sysroot.
>
> We assume that version gcc 4.2.1 is special and our in-tree compiler
> elsewhere,
> so please add a check for that and just go ahead and duplicate those two
> lines.
>
> Eg
>
> +.else if ${COMPILER_VERSION} > 40201
> +XCFLAGS+=      --sysroot=${WORLDTMP} ${BFLAGS}
> +XCXXFLAGS+=    --sysroot=${WORLDTMP} ${BFLAGS}
> .endif
>
>
The following worked for me.  Is it OK to commit?

Index: Makefile.inc1
===================================================================
--- Makefile.inc1       (revision 280353)
+++ Makefile.inc1       (working copy)
@@ -375,10 +375,14 @@
 .endif
 .if defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc
 XCFLAGS+=      -isystem ${WORLDTMP}/usr/include -L${WORLDTMP}/usr/lib
 XCXXFLAGS+=    -I${WORLDTMP}/usr/include/c++/v1 -std=gnu++11
-L${WORLDTMP}/../lib/libc++
 DEPFLAGS+=     -I${WORLDTMP}/usr/include/c++/v1
+.if ${COMPILER_VERSION} > 40201
+XCFLAGS+=      --sysroot=${WORLDTMP} ${BFLAGS}
+XCXXFLAGS+=    --sysroot=${WORLDTMP} ${BFLAGS}
+.endif
 .else
 TARGET_ABI?=   unknown
 TARGET_TRIPLE?=
${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0
 XCFLAGS+=      -target ${TARGET_TRIPLE}
 XCFLAGS+=      --sysroot=${WORLDTMP} ${BFLAGS}

--
Craig