svn commit: r329993 - head
Brooks Davis
brooks at FreeBSD.org
Sun Feb 25 20:21:31 UTC 2018
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)
More information about the svn-src-head
mailing list