diff options
| -rw-r--r-- | test/bootstrap/TARGETS | 2 | ||||
| -rw-r--r-- | test/bootstrap/test-bootstrap.sh | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/test/bootstrap/TARGETS b/test/bootstrap/TARGETS index 1bbf365f..f87cc1a5 100644 --- a/test/bootstrap/TARGETS +++ b/test/bootstrap/TARGETS @@ -35,7 +35,7 @@ [ ["SUFFIX", "-gnu"] , [ "TEST_ENV" , { "type": "singleton_map" - , "key": "JUST_BUILD_CONFIG" + , "key": "JUST_BUILD_CONF" , "value": "{\"COMPILER_FAMILY\": \"gnu\", \"CC\": \"gcc\", \"CXX\": \"g++\"}" } ] diff --git a/test/bootstrap/test-bootstrap.sh b/test/bootstrap/test-bootstrap.sh index 48b0aa9e..b0ebdad3 100644 --- a/test/bootstrap/test-bootstrap.sh +++ b/test/bootstrap/test-bootstrap.sh @@ -42,7 +42,8 @@ echo cat ${PRUNED_CONFIG} echo readonly CONF=$(./bin/just-mr.py -C ${PRUNED_CONFIG} --distdir=distdir --local-build-root="${LBRDIR}" setup just) -${JUST} install -C ${CONF} -o "${OUTDIR}"/final-out --local-build-root="${LBRDIR}" +: ${JUST_BUILD_CONF:="{}"} +${JUST} install -C ${CONF} -D "${JUST_BUILD_CONF}" -o "${OUTDIR}"/final-out --local-build-root="${LBRDIR}" sha256sum "${OUTDIR}"/boot/out/bin/just "${OUTDIR}"/final-out/bin/just cmp "${OUTDIR}"/boot/out/bin/just "${OUTDIR}"/final-out/bin/just |