aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/boot/Makefile.amd645
-rw-r--r--sys/boot/Makefile.i3863
2 files changed, 7 insertions, 1 deletions
diff --git a/sys/boot/Makefile.amd64 b/sys/boot/Makefile.amd64
index f2ccbad05b23..5e730bd6c62f 100644
--- a/sys/boot/Makefile.amd64
+++ b/sys/boot/Makefile.amd64
@@ -3,9 +3,12 @@
SUBDIR+= efi
SUBDIR+= libstand32
SUBDIR+= zfs
-SUBDIR+= geli
SUBDIR+= userboot
+.if !defined(LOADER_NO_GELI_SUPPORT)
+SUBDIR+= geli
+.endif
+
.if ${MK_FORTH} != "no"
SUBDIR+= ficl32
.endif
diff --git a/sys/boot/Makefile.i386 b/sys/boot/Makefile.i386
index 8244da5a18c5..7c1990558ea7 100644
--- a/sys/boot/Makefile.i386
+++ b/sys/boot/Makefile.i386
@@ -3,4 +3,7 @@
SUBDIR+= efi
SUBDIR+= libstand32
SUBDIR+= zfs
+
+.if !defined(LOADER_NO_GELI_SUPPORT)
SUBDIR+= geli
+.endif