Unverified Commit 0a617f4e authored by Shawn Webb's avatar Shawn Webb
Browse files

Separate the dynamic variables



When setting non-default values in a custom config, the dynamic
variables are already set based on the defaults. This commit makes the
dynamic variables respect the values from the config.

Signed-off-by: Shawn Webb's avatarShawn Webb <shawn.webb@hardenedbsd.org>
parent 0837e576
......@@ -57,6 +57,8 @@ main() {
esac
done
config_set_dynamic
(
assert_unlocked && \
lock_build && \
......
......@@ -39,8 +39,12 @@ config_set_defaults() {
HBSD_NOCLEAN="-DNO_CLEAN"
HBSD_LOGDIR=/build/logs/13-current.amd64
HBSD_BUILDNUMBER=$(build_number)
HBSD_BUILD_LOG=${HBSD_LOGDIR}/${HBSD_BUILDNUMBER}.log
return 0
}
config_set_dynamic() {
HBSD_BUILDNUMBER=${HBSD_BUILDNUMBER:-$(build_number)}
HBSD_BUILD_LOG=${HBSD_BUILD_LOG:-${HBSD_LOGDIR}/${HBSD_BUILDNUMBER}.log}
HBSD_OBJRELDIR="$(make -C ${HBSD_SRC} -V .OBJDIR)/release"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment