diff --git a/configure/os/CONFIG.Common.UnixCommon b/configure/os/CONFIG.Common.UnixCommon
index 6163b7975..a6337324d 100644
--- a/configure/os/CONFIG.Common.UnixCommon
+++ b/configure/os/CONFIG.Common.UnixCommon
@@ -8,7 +8,7 @@
 #-------------------------------------------------------
 
 # Unix valid build types
-VALID_BUILDS = Host Ioc Command
+VALID_BUILDS = $(if $(filter HOST,$(BUILD_CLASS)),Host) Ioc Command
 
 #-------------------------------------------------------
 # Unix prefix and suffix definitions
diff --git a/configure/os/CONFIG_SITE.Common.linuxCommon b/configure/os/CONFIG_SITE.Common.linuxCommon
index f3dc92ef7..d79c1f805 100644
--- a/configure/os/CONFIG_SITE.Common.linuxCommon
+++ b/configure/os/CONFIG_SITE.Common.linuxCommon
@@ -18,10 +18,6 @@ GNU_DIR = $(SYSROOT)$(TOOLSET_DIR)
 TARGET_CPPFLAGS += $(SYSROOT:%=--sysroot=%)
 TARGET_LDFLAGS  += $(SYSROOT:%=--sysroot=%)
 
-ifeq ($(filter SL% RHEL%,$(T_A)),)
-VALID_BUILDS = Ioc Command
-endif
-
 # backward compatibility: Keep unversioned libs
 # in order to prevent dynamic linking problems
 # when minor changes increment *_MAINTENANCE_VERSION