diff options
| author | Oliver Reiche <oliver.reiche@huawei.com> | 2023-07-06 14:21:27 +0200 |
|---|---|---|
| committer | Oliver Reiche <oliver.reiche@huawei.com> | 2023-08-16 15:32:11 +0200 |
| commit | ffbb5ab230d1307e10f72bf5d94441b2a134c5af (patch) | |
| tree | f4e37ba002208001188add56e12c57fb6054a896 /test/bootstrap/test-mixed-bootstrap.sh | |
| parent | e17365cb6d1af6ae12fdaaf97f28a02c7ee61bed (diff) | |
| download | justbuild-ffbb5ab230d1307e10f72bf5d94441b2a134c5af.tar.gz | |
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"].
Diffstat (limited to 'test/bootstrap/test-mixed-bootstrap.sh')
| -rwxr-xr-x | test/bootstrap/test-mixed-bootstrap.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |