From nobody Fri Mar 11 17:17:54 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9F62819FBE6E; Fri, 11 Mar 2022 17:17:56 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KFXgm48sLz4j5L; Fri, 11 Mar 2022 17:17:56 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647019076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uSWwm9toUrqka1ezumGRzNe0RfAusD3YAcDR8ZcrWcA=; b=pfAxQUPzz3Bf5UKO5IBloDKbN4WjHbhkNntyNj+/+WGYJcWJwnu7oWuzVXbZdtYr3dCwHi /xCVkk5/9V+mkTb/WsrIHEuwp02KJiwdRY92SIQe93NV7sfHLqm2Kv+LWQfdNul2HaU00o tzkeknpKuSGgLDcNrgxgZo/rMKOcehRdyJA4K8/O5rv1rSvoDsfRN4RgYYx5pvZgqhGkvy d8ytGUcxu6jU4vLZ1N199czqLfWw73ji+F9XTvrbjt2K+ufYrPWy742BEZYBBoiX4csyII DOMMD/UieGrkIpg7wg3tusp5qvZZlDmsVPB12cPOJ6OQ9kK13IKoxwGib9uErQ== Received: from [10.0.1.4] (ralph.baldwin.cx [66.234.199.215]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id D9D0A2E601; Fri, 11 Mar 2022 17:17:55 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <71654bd0-86e5-1f6d-44e9-4f05644e878d@FreeBSD.org> Date: Fri, 11 Mar 2022 09:17:54 -0800 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.6.0 Subject: Re: git: 7ecd99fa424d - main - Build compiler-rt against libunwind, not libcxxrt Content-Language: en-US To: Dimitry Andric Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" References: <202203092130.229LUKFS011484@gitrepo.freebsd.org> <1eb62898-4f0a-504f-26a8-ee01c46093a6@FreeBSD.org> <1129443B-EFC8-4F02-B87E-37CA04A0AD64@FreeBSD.org> From: John Baldwin In-Reply-To: <1129443B-EFC8-4F02-B87E-37CA04A0AD64@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647019076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uSWwm9toUrqka1ezumGRzNe0RfAusD3YAcDR8ZcrWcA=; b=SbZuAOd9wODeMOziNz0zdAVfUurpzn5kbWd+cktJloSc44n6a9aAdvAXdGWIL7G02vN/d6 ZPkQ7uc6brT4HjHhLTrP5sSKH7DzMgUUwWSGwD5cAY1HMjfS7dCW/mo+O3/VLggvZdfEHi anokN8BBeIyHSsz8FxUGXDvRC/qvlSozeekbGBQo6ORpf/Eh4dNZSAfisFWRLCZWRTi3Qs kIUTUifPmg9Ad3DlThh9UabRDD5gkWKTbYRbILtQb/VuEzPMxEMI6pNPN9SGPhdYFYB4fH 5E6bAv80Kk4ylJVJwA5dl8J7T4zXgZO3lYFXBRpZx2DctJiNdV4cAxscjDLy+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647019076; a=rsa-sha256; cv=none; b=RTdCSI8tMv18gc9E9WA2u+xArmqOhXiEeVf/CQcyk7/gKzISAESKuXguKteGYhv7HPv+BQ 9k68+nM8EfV5+1ixNnHLZC3QnDkj7ddf9d4FgYKMn1c1jLBr4toPtI/7Tj5m6SVGJ3ZnUC Yoxr84QFAHbMaxmS4HDCcYo8zSzVYSc2/FtfRfAJXWT5q8utCxaC3jhaYHUJLR7EZl7tAH VUwwJRGgo4ZlhMY66wVuvw6nadT39wLKm9wJC5oRW3Qw4z2mcYmPk85p/OHA2xZjfMDjG9 NB07yZAxN/vvcvMX9uOOxTL627OPHS2Z4oHq9HEL5RV1L9WdmD5wKjtcZy9i+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On 3/9/22 2:50 PM, Dimitry Andric wrote: > On 9 Mar 2022, at 22:45, John Baldwin wrote: >> >> On 3/9/22 1:30 PM, Dimitry Andric wrote: >>> The branch main has been updated by dim: >>> URL: https://cgit.FreeBSD.org/src/commit/?id=7ecd99fa424df001028c5cddc52d25b29232f1af >>> commit 7ecd99fa424df001028c5cddc52d25b29232f1af >>> Author: Dimitry Andric >>> AuthorDate: 2022-03-09 21:23:35 +0000 >>> Commit: Dimitry Andric >>> CommitDate: 2022-03-09 21:23:35 +0000 >>> Build compiler-rt against libunwind, not libcxxrt >>> Parts of compiler-rt are also built for libgcc_eh and libgcc_s, and >>> these were already pointing to the libunwind unwind.h. For the sake of >>> consistency, also build compiler-rt itself against the libunwind >>> unwind.h, not the libcxxrt one. >> >> Do we even need the explicit -I at all now that we install unwind.h into /usr/include? > > That depends on the build order; if libcompiler_rt is built before libunwind's headers are installed into ${WORLDTMP}, it might look at the wrong file? I think that can't happen now that we install the header as buildincludes and installincludes should run first before we build any of the libraries? > I guess this is just a 'better safe than sorry' approach. That said, for libcxxrt we used to have the unwind headers only in the C++ include path, so maybe this was a way to get that to work? Yes, I think the problem before is that the installed unwind.h was only in the C++ include path and not in the C include path. I think moving unwind.h to /usr/include is what permits removing the explicit -I. -- John Baldwin