Date: Sat, 24 Mar 2018 21:19:04 -0700 From: John Baldwin <jhb@FreeBSD.org> To: Antoine Brodin <antoine@freebsd.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r465416 - in head/devel: aarch64-gcc amd64-gcc mips-gcc mips64-gcc powerpc64-gcc sparc64-gcc Message-ID: <c7e8f7d2-ccef-cf5c-e5a0-f98ab6d8e647@FreeBSD.org> In-Reply-To: <CAALwa8mbBeTcUPyoJk=Q7edLo-Jwr3h%2BDYhVU0Y=V8v93P454Q@mail.gmail.com> References: <201803232353.w2NNrqnJ028176@repo.freebsd.org> <CAALwa8mbBeTcUPyoJk=Q7edLo-Jwr3h%2BDYhVU0Y=V8v93P454Q@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 3/23/18 11:35 PM, Antoine Brodin wrote: > On Sat, Mar 24, 2018 at 12:53 AM, John Baldwin <jhb@freebsd.org> wrote: >> Author: jhb (src,doc committer) >> Date: Fri Mar 23 23:53:52 2018 >> New Revision: 465416 >> URL: https://svnweb.freebsd.org/changeset/ports/465416 >> >> Log: >> Fix --sysroot for cross-toolchain GCC packages >> >> By default, GCC assumes that a cross compiler should not have any valid >> initial include or library paths aside from /usr/local/lib/gcc/<mumble>/. >> This means that one cannot use --sysroot to point to a system root for >> another architecture and have GCC automatically look for headers in >> ${sysroot}/usr/include, etc. Currently we workaround this in FreeBSD's >> build system with explicit -isystem, -B, and -L directives. However, >> this is cumbersome compared to clang (where a bare --sysroot DTRT) >> especially when using the compiler to build other software (such as test >> programs, etc.). >> >> One can override GCC's assumption and force it to assume that it should >> honor --sysroot by setting the '--with-sysroot' option to force GCC to >> assume a specific system root. By setting this to '/', this means that >> the cross-compiler will attempt to use the host's headers by default >> if --sysroot is not specified, but if --sysroot is specified then >> it is fully honored including for include paths and library paths. With >> this change I can now cross-compile both C and C++ binaries simply by >> using --sysroot without the need for -isystem, -B, or -L directives. Note >> that the base/gcc and devel/riscv64-gcc ports both use --with-sysroot='/' >> already. >> >> By default, GCC looks for headers in /usr/local/include (under the >> sysroot) before /usr/include. To disable this and only look for headers >> in /usr/include, patch gcc/Makefile.in to not define LOCAL_INCLUDE_DIR. >> >> Once -nostdinc is no longer required, the headers installed along with the >> compiler are now used for compiling worlds and test programs. The "fixed" >> headers in include-fixed are generally not helpful and are also derived >> from the host's headers which might not match the target --sysroot, so >> just delete them entirely. Even the stub limits.h headers GCC ships when >> using an empty build sysroot are not helpful and need to be removed. >> >> On a related note, I also fixed the name of the C++ include directory >> option to configure. By my reading it is 'with-gxx-include-dir' rather >> than 'with-gcc-include-dir'. >> >> Reviewed by: bapt, brooks, kan >> Sponsored by: DARPA / AFRL >> Differential Revision: https://reviews.freebsd.org/D14627 >> >> Modified: >> head/devel/aarch64-gcc/pkg-plist >> head/devel/amd64-gcc/pkg-plist >> head/devel/mips-gcc/pkg-plist >> head/devel/mips64-gcc/pkg-plist >> head/devel/powerpc64-gcc/Makefile >> head/devel/powerpc64-gcc/pkg-plist >> head/devel/sparc64-gcc/pkg-plist > > Hi, > > It seems some ports were missed, like devel/aarch64-none-elf-gcc and > devel/arm-none-eabi-gcc Oof, I was only aware of xtoolchain-gcc packages that were slaves of powerpc64-gcc. I'll search for any others (including those), do test builds, and fix the pkg-plist files Monday. (I have a pending review for riscv64-gcc, but it isn't a slave of powerpc64-gcc currently.) -- John Baldwin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?c7e8f7d2-ccef-cf5c-e5a0-f98ab6d8e647>