mkosi: Check for configured build directory if WIPE=1
Otherwise trying to use --wipe might fail if the build directory has not been configured but is not empty either.
This commit is contained in:
committed by
Luca Boccassi
parent
f9572d2b89
commit
73b3179a53
@@ -33,7 +33,7 @@ if ((LLVM)) && [[ -n "$SANITIZERS" ]]; then
|
||||
fi
|
||||
|
||||
MKOSI_MESON_OPTIONS="-D mode=developer -D b_sanitize=${SANITIZERS:-none}"
|
||||
if ((WIPE)); then
|
||||
if ((WIPE)) && [[ -d "$BUILDDIR/meson-private" ]]; then
|
||||
MKOSI_MESON_OPTIONS="$MKOSI_MESON_OPTIONS --wipe"
|
||||
fi
|
||||
|
||||
|
||||
@@ -62,7 +62,7 @@ if ((LLVM)) && [[ -n "$SANITIZERS" ]]; then
|
||||
fi
|
||||
|
||||
MKOSI_MESON_OPTIONS="-D mode=developer -D b_sanitize=${SANITIZERS:-none}"
|
||||
if ((WIPE)); then
|
||||
if ((WIPE)) && [[ -d "$BUILDDIR/meson-private" ]]; then
|
||||
MKOSI_MESON_OPTIONS="$MKOSI_MESON_OPTIONS --wipe"
|
||||
fi
|
||||
|
||||
|
||||
@@ -56,7 +56,7 @@ if ((LLVM)) && [[ -n "$SANITIZERS" ]]; then
|
||||
fi
|
||||
|
||||
MKOSI_MESON_OPTIONS="-D mode=developer -D b_sanitize=${SANITIZERS:-none}"
|
||||
if ((WIPE)); then
|
||||
if ((WIPE)) && [[ -d "$BUILDDIR/meson-private" ]]; then
|
||||
MKOSI_MESON_OPTIONS="$MKOSI_MESON_OPTIONS --wipe"
|
||||
fi
|
||||
|
||||
|
||||
@@ -63,7 +63,7 @@ if [[ -z "${MKOSI_LDFLAGS// }" ]]; then
|
||||
fi
|
||||
|
||||
MKOSI_MESON_OPTIONS="-D mode=developer -D b_sanitize=${SANITIZERS:-none}"
|
||||
if ((WIPE)); then
|
||||
if ((WIPE)) && [[ -d "$BUILDDIR/meson-private" ]]; then
|
||||
MKOSI_MESON_OPTIONS="$MKOSI_MESON_OPTIONS --wipe"
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user