Date: Sun, 25 Feb 2018 20:21:30 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r329993 - head Message-ID: <201802252021.w1PKLUgd012129@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Sun Feb 25 20:21:30 2018 New Revision: 329993 URL: https://svnweb.freebsd.org/changeset/base/329993 Log: Allow CROSS_TOOLCHAIN to be a path to a file. This allows working with custom cross toolchains without the need to create files in /usr/local/share/toolchains. Obtained from: CheriBSD Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D14178 Modified: head/Makefile.inc1 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sun Feb 25 20:15:06 2018 (r329992) +++ head/Makefile.inc1 Sun Feb 25 20:21:30 2018 (r329993) @@ -56,7 +56,13 @@ LOCALBASE?= /usr/local # Cross toolchain changes must be in effect before bsd.compiler.mk # so that gets the right CC, and pass CROSS_TOOLCHAIN to submakes. .if defined(CROSS_TOOLCHAIN) +.if exists(${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk) .include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk" +.elif exists(${CROSS_TOOLCHAIN}) +.include "${CROSS_TOOLCHAIN}" +.else +.error CROSS_TOOLCHAIN is '${CROSS_TOOLCHAIN}' which is invalid +.endif CROSSENV+=CROSS_TOOLCHAIN="${CROSS_TOOLCHAIN}" .endif .if defined(CROSS_TOOLCHAIN_PREFIX)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802252021.w1PKLUgd012129>