diff --git a/configure/os/CONFIG.Common.linux-x86_64-debug b/configure/os/CONFIG.Common.linux-x86_64-debug
index 588c2fb3e..b8d7dade4 100644
--- a/configure/os/CONFIG.Common.linux-x86_64-debug
+++ b/configure/os/CONFIG.Common.linux-x86_64-debug
@@ -10,3 +10,4 @@
 # Include definitions common to all linux-x86_64  target archs
 include $(CONFIG)/os/CONFIG.Common.linux-x86_64
 
+HOST_OPT=NO
diff --git a/configure/os/CONFIG.linux-x86_64-debug.linux-x86_64-debug b/configure/os/CONFIG.linux-x86_64-debug.linux-x86_64-debug
index 2fadd4ae7..4e2c6a1a5 100644
--- a/configure/os/CONFIG.linux-x86_64-debug.linux-x86_64-debug
+++ b/configure/os/CONFIG.linux-x86_64-debug.linux-x86_64-debug
@@ -9,6 +9,8 @@
 
 include $(CONFIG)/os/CONFIG.linux-x86_64.linux-x86_64
 
+BUILD_CLASS=HOST
+
 # Removes -O optimization and adds -g compile option
 HOST_OPT=NO
 
diff --git a/configure/os/CONFIG.linux-x86_64.linux-x86_64-debug b/configure/os/CONFIG.linux-x86_64.linux-x86_64-debug
index b97e6bd57..4fbac62ac 100644
--- a/configure/os/CONFIG.linux-x86_64.linux-x86_64-debug
+++ b/configure/os/CONFIG.linux-x86_64.linux-x86_64-debug
@@ -7,6 +7,8 @@
 # Sites may override these definitions in CONFIG_SITE.linux-x86_64.linux-x86_64-debug
 #-------------------------------------------------------
 
-include $(CONFIG)/os/CONFIG.linux-x86_64.linux-x86_64
+include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
 
-CROSS_OPT = NO
+BUILD_CLASS=HOST
+
+HOST_OPT = NO