diff --git a/configure/os/CONFIG.solaris-sparc64.solaris-sparc64-debug b/configure/os/CONFIG.solaris-sparc64.solaris-sparc64-debug
index c739c6cbf..8101ca208 100644
--- a/configure/os/CONFIG.solaris-sparc64.solaris-sparc64-debug
+++ b/configure/os/CONFIG.solaris-sparc64.solaris-sparc64-debug
@@ -10,10 +10,7 @@
 include $(CONFIG)/os/CONFIG.Common.solaris-sparc64
 include $(CONFIG)/os/CONFIG.solaris-sparc64.solaris-sparc64
 
-#BUILD_CLASS = HOST
-#HOST_OPT = NO
-
-GNU = NO
+BUILD_CLASS=HOST
 
 # Removes -O optimization and adds -g compile option
-CROSS_OPT=NO
+HOST_OPT=NO
diff --git a/configure/os/CONFIG.solaris-x86.solaris-x86-debug b/configure/os/CONFIG.solaris-x86.solaris-x86-debug
index 58c00b26c..163cb71f9 100644
--- a/configure/os/CONFIG.solaris-x86.solaris-x86-debug
+++ b/configure/os/CONFIG.solaris-x86.solaris-x86-debug
@@ -10,10 +10,7 @@
 include $(CONFIG)/os/CONFIG.Common.solaris-x86
 include $(CONFIG)/os/CONFIG.solaris-x86.solaris-x86
 
-#BUILD_CLASS = HOST
-#HOST_OPT = NO
-
-GNU = NO
+BUILD_CLASS=HOST
 
 # Removes -O optimization and adds -g compile option
-CROSS_OPT=NO
+HOST_OPT=NO
diff --git a/configure/os/CONFIG.solaris-x86_64.solaris-x86_64-debug b/configure/os/CONFIG.solaris-x86_64.solaris-x86_64-debug
index 998e916c1..b6ba1aede 100644
--- a/configure/os/CONFIG.solaris-x86_64.solaris-x86_64-debug
+++ b/configure/os/CONFIG.solaris-x86_64.solaris-x86_64-debug
@@ -10,10 +10,7 @@
 include $(CONFIG)/os/CONFIG.Common.solaris-x86_64
 include $(CONFIG)/os/CONFIG.solaris-x86_64.solaris-x86_64
 
-#BUILD_CLASS = HOST
-#HOST_OPT = NO
-
-GNU = NO
+BUILD_CLASS=HOST
 
 # Removes -O optimization and adds -g compile option
-CROSS_OPT=NO
+HOST_OPT=NO