svn commit: r358729 - head/share/mk

[Justin Hibbits]

Author: jhibbits
Date: Sat Mar  7 03:58:58 2020
New Revision: 358729
URL: https://svnweb.freebsd.org/changeset/base/358729

Log:
  compat: Allow explicit overriding of COMPAT_ARCH and COMPAT_CPUTYPE
  
  Summary:
  Allow src.conf to override the inferred COMPAT_ARCH and COMPAT_CPUTYPE
  variables, such that a different CPU target can be specified explicitly
  for the general target vs the compat target.
  
  Reviewed by:	imp
  Differential Revision:	https://reviews.freebsd.org/D23992

Modified:
  head/share/mk/bsd.compat.mk

Modified: head/share/mk/bsd.compat.mk
==============================================================================
--- head/share/mk/bsd.compat.mk	Sat Mar  7 00:55:46 2020	(r358728)
+++ head/share/mk/bsd.compat.mk	Sat Mar  7 03:58:58 2020	(r358729)
@@ -4,8 +4,8 @@
 __<${_this:T}>__:
 
 .if defined(_LIBCOMPAT)
-COMPAT_ARCH=	${TARGET_ARCH}
-COMPAT_CPUTYPE=	${TARGET_CPUTYPE}
+COMPAT_ARCH?=	${TARGET_ARCH}
+COMPAT_CPUTYPE?= ${CPUTYPE_${_LIBCOMPAT}}
 .if (defined(WANT_COMPILER_TYPE) && ${WANT_COMPILER_TYPE} == gcc) || \
     (defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc)
 COMPAT_COMPILER_TYPE=	gcc