Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 2 Jan 2020 21:34:45 +0000 (UTC)
From:      John Baldwin <jhb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r356289 - head
Message-ID:  <202001022134.002LYj7M079257@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jhb
Date: Thu Jan  2 21:34:44 2020
New Revision: 356289
URL: https://svnweb.freebsd.org/changeset/base/356289

Log:
  Look for cross toolchain makefiles in /usr/share/toolchains.
  
  The freebsd-binutils and freebsd-gcc* packages install toolchain
  makefiles to /usr/share/toolchains rather than LOCALBASE.
  
  Reviewed by:	bapt
  Differential Revision:	https://reviews.freebsd.org/D22985

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Thu Jan  2 21:13:22 2020	(r356288)
+++ head/Makefile.inc1	Thu Jan  2 21:34:44 2020	(r356289)
@@ -62,6 +62,8 @@ LOCALBASE?=	/usr/local
 .if defined(CROSS_TOOLCHAIN)
 .if exists(${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk)
 .include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk"
+.elif exists(/usr/share/toolchains/${CROSS_TOOLCHAIN}.mk)
+.include "/usr/share/toolchains/${CROSS_TOOLCHAIN}.mk"
 .elif exists(${CROSS_TOOLCHAIN})
 .include "${CROSS_TOOLCHAIN}"
 .else



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001022134.002LYj7M079257>