diff options
| author | n_hibma <n_hibma@FreeBSD.org> | 2014-11-27 09:17:42 +0000 |
|---|---|---|
| committer | n_hibma <n_hibma@FreeBSD.org> | 2014-11-27 09:17:42 +0000 |
| commit | 344092890d66f7aa946193547a5109f685881d32 (patch) | |
| tree | 0c2f4d17222d96b9f41803108dfbba757e172d1e /tools | |
| parent | da596c6bb1c53a77676e62c47add1c000b872cf5 (diff) | |
| download | FreeBSD-src-344092890d66f7aa946193547a5109f685881d32.zip FreeBSD-src-344092890d66f7aa946193547a5109f685881d32.tar.gz | |
clean_build is not always done (*), so move the mkdir to the first step
that needs it and is always done: make.conf build.
(*) In our build environment we actually never do a clean build unless
instructed to do so, to make sure we do not accidentally delete the
built world when on a tight schedule.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/tools/nanobsd/nanobsd.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/tools/nanobsd/nanobsd.sh b/tools/tools/nanobsd/nanobsd.sh index 685f496..7789ef0 100644 --- a/tools/tools/nanobsd/nanobsd.sh +++ b/tools/tools/nanobsd/nanobsd.sh @@ -213,13 +213,14 @@ clean_build ( ) ( chflags -R noschg ${MAKEOBJDIRPREFIX}/ nano_rm -r ${MAKEOBJDIRPREFIX}/ fi - mkdir -p ${MAKEOBJDIRPREFIX} - printenv > ${MAKEOBJDIRPREFIX}/_.env ) make_conf_build ( ) ( pprint 2 "Construct build make.conf ($NANO_MAKE_CONF_BUILD)" + mkdir -p ${MAKEOBJDIRPREFIX} + printenv > ${MAKEOBJDIRPREFIX}/_.env + echo "${CONF_WORLD}" > ${NANO_MAKE_CONF_BUILD} echo "${CONF_BUILD}" >> ${NANO_MAKE_CONF_BUILD} ) |
