From ffbb5ab230d1307e10f72bf5d94441b2a134c5af Mon Sep 17 00:00:00 2001 From: Oliver Reiche Date: Thu, 6 Jul 2023 14:21:27 +0200 Subject: Introduce configuration variable TOOLCHAIN_CONFIG ... to pass along toolchain settings for current and future toolchain definitions. Configuration variable COMPILER_FAMILY is replaced by TOOLCHAIN_CONFIG["FAMILY"]. --- test/bootstrap/test-mixed-bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/bootstrap/test-mixed-bootstrap.sh') diff --git a/test/bootstrap/test-mixed-bootstrap.sh b/test/bootstrap/test-mixed-bootstrap.sh index 981116c4..2a665445 100755 --- a/test/bootstrap/test-mixed-bootstrap.sh +++ b/test/bootstrap/test-mixed-bootstrap.sh @@ -51,7 +51,7 @@ cp distdir/fmt-10.0.0.zip "${DISTDIR}" env LOCALBASE=${LOCALBASE} \ PACKAGE=YES \ NON_LOCAL_DEPS='["com_github_microsoft_gsl", "fmt"]' \ - JUST_BUILD_CONF='{"COMPILER_FAMILY":"clang", "PKG_CONFIG_ARGS":["--define-prefix"]}' \ + JUST_BUILD_CONF='{"TOOLCHAIN_CONFIG":{"FAMILY":"clang"}, "PKG_CONFIG_ARGS":["--define-prefix"]}' \ python3 ${WRKSRC}/bin/bootstrap.py ${WRKSRC} ${WRKDIR} ${DISTDIR} 2>&1 # Do some sanity checks with the binary -- cgit v1.2.3