From 3e09d9eed18d238247a801cf05fa2ab22921f693 Mon Sep 17 00:00:00 2001
From: vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f>
Date: Fri, 19 Jul 2019 16:16:19 +0000
Subject: *.kmk: Preparing for dropping 32-bit host support.  Introducing a
 variable VBOX_SUPPORTED_HOST_ARCHS controlling what's supported and not.
 bugref:9511

git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@79891 cfe28804-0f27-0410-a406-dd0f0b0b656f
---
 src/VBox/NetworkServices/Makefile.kmk | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/VBox/NetworkServices/Makefile.kmk')

diff --git a/src/VBox/NetworkServices/Makefile.kmk b/src/VBox/NetworkServices/Makefile.kmk
index 2666ba001d4..3d1be159cb5 100644
--- a/src/VBox/NetworkServices/Makefile.kmk
+++ b/src/VBox/NetworkServices/Makefile.kmk
@@ -18,13 +18,13 @@
 SUB_DEPTH = ../../..
 include $(KBUILD_PATH)/subheader.kmk
 
-# VBoxNetDHCP and VBoxNetNAT require COM/XPCOM
-ifdef VBOX_WITH_MAIN
- # Include sub-makefiles.
- include $(PATH_SUB_CURRENT)/Dhcpd/Makefile.kmk
- ifdef VBOX_WITH_NAT_SERVICE
-  include $(PATH_SUB_CURRENT)/NAT/Makefile.kmk
- endif
+# Include sub-makefiles.
+include $(PATH_SUB_CURRENT)/Dhcpd/Makefile.kmk
+
+# VBoxNetNAT requires COM/XPCOM.
+if defined(VBOX_WITH_NAT_SERVICE) && defined(VBOX_WITH_MAIN) \
+  && "$(intersects $(KBUILD_TARGET_ARCH),$(VBOX_SUPPORTED_HOST_ARCHS))" != ""
+ include $(PATH_SUB_CURRENT)/NAT/Makefile.kmk
 endif
 
 include $(FILE_KBUILD_SUB_FOOTER)
-- 
cgit v1.2.1