diff options
Diffstat (limited to 'test/bootstrap')
| -rw-r--r-- | test/bootstrap/TARGETS | 2 | ||||
| -rwxr-xr-x | test/bootstrap/test-bootstrap-pkgconfig.sh | 2 | ||||
| -rwxr-xr-x | test/bootstrap/test-mixed-bootstrap.sh | 2 | ||||
| -rwxr-xr-x | test/bootstrap/test-symlink-bootstrap.sh | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/test/bootstrap/TARGETS b/test/bootstrap/TARGETS index ab8ae1e6..039dec92 100644 --- a/test/bootstrap/TARGETS +++ b/test/bootstrap/TARGETS @@ -36,7 +36,7 @@ , [ "TEST_ENV" , { "type": "singleton_map" , "key": "JUST_BUILD_CONF" - , "value": "{\"COMPILER_FAMILY\": \"gnu\", \"CC\": \"gcc\", \"CXX\": \"g++\"}" + , "value": "{\"TOOLCHAIN_CONFIG\":{\"FAMILY\": \"gnu\"}, \"CC\": \"gcc\", \"CXX\": \"g++\"}" } ] ] diff --git a/test/bootstrap/test-bootstrap-pkgconfig.sh b/test/bootstrap/test-bootstrap-pkgconfig.sh index 3087d380..d9e0da02 100755 --- a/test/bootstrap/test-bootstrap-pkgconfig.sh +++ b/test/bootstrap/test-bootstrap-pkgconfig.sh @@ -35,7 +35,7 @@ mkdir -p ${TEST_OUT_DIR} env LOCALBASE=${LOCALBASE} \ PACKAGE=YES \ - 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} 2>&1 # Do some sanity checks with the binary 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 diff --git a/test/bootstrap/test-symlink-bootstrap.sh b/test/bootstrap/test-symlink-bootstrap.sh index dc541fe4..49554cf3 100755 --- a/test/bootstrap/test-symlink-bootstrap.sh +++ b/test/bootstrap/test-symlink-bootstrap.sh @@ -50,7 +50,7 @@ ln -s ${UNRELATED_FILE} ${LOCALBASE}/lib/libfoo.so env LOCALBASE=${LOCALBASE} \ PACKAGE=YES \ - 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} 2>&1 # Do some sanity checks with the binary |