diff --git a/configure/os/CONFIG.linux-x86-debug.linux-x86-debug b/configure/os/CONFIG.linux-x86-debug.linux-x86-debug
index f4ced3843..8ed9095fb 100644
--- a/configure/os/CONFIG.linux-x86-debug.linux-x86-debug
+++ b/configure/os/CONFIG.linux-x86-debug.linux-x86-debug
@@ -9,6 +9,8 @@
 
 include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
 
+BUILD_CLASS=HOST
+
 # Removes -O optimization and adds -g compile option
 HOST_OPT=NO
 
diff --git a/configure/os/CONFIG.linux-x86.linux-x86-debug b/configure/os/CONFIG.linux-x86.linux-x86-debug
index 1b9dd3a71..76ccdf463 100644
--- a/configure/os/CONFIG.linux-x86.linux-x86-debug
+++ b/configure/os/CONFIG.linux-x86.linux-x86-debug
@@ -9,9 +9,6 @@
 
 include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
 
-# This will cause build failure when used with make -j option
-# See base/src/bpt MAKEBPT
-#BUILD_CLASS = HOST
-#HOST_OPT = NO
+BUILD_CLASS=HOST
+HOST_OPT=NO
 
-CROSS_OPT=NO