git: 76d756eaa682 - main - Makefile.vm: Split error condition
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 06 May 2026 17:51:36 UTC
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=76d756eaa6823aad282cc53ec4e41a9777d89adc
commit 76d756eaa6823aad282cc53ec4e41a9777d89adc
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2026-05-05 21:12:25 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2026-05-06 17:50:07 +0000
Makefile.vm: Split error condition
Make it clear which of two possible cases applies.
Reviewed by: cperciva
Differential Revision: https://reviews.freebsd.org/D56837
---
release/Makefile.vm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/release/Makefile.vm b/release/Makefile.vm
index d937783f02fe..8296fc47a477 100644
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -99,9 +99,10 @@ QEMUTGT?=
.if (defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE)) || \
(defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES))
-.if (defined(WITHOUT_QEMU) && !defined(NO_ROOT)) || \
- (!defined(WITHOUT_QEMU) && defined(NO_ROOT))
-.error WITHOUT_QEMU requires NO_ROOT (and vice versa)
+.if (defined(WITHOUT_QEMU) && !defined(NO_ROOT))
+.error WITHOUT_QEMU requires NO_ROOT
+.elif (!defined(WITHOUT_QEMU) && defined(NO_ROOT))
+.error NO_ROOT requires WITHOUT_QEMU
.endif
.endif