diff --git a/configure/os/CONFIG.cygwin-x86.cygwin-x86-debug b/configure/os/CONFIG.cygwin-x86.cygwin-x86-debug
index bbb8c7aec..e919125d0 100644
--- a/configure/os/CONFIG.cygwin-x86.cygwin-x86-debug
+++ b/configure/os/CONFIG.cygwin-x86.cygwin-x86-debug
@@ -10,4 +10,6 @@
 include $(CONFIG)/os/CONFIG.Common.cygwin-x86
 include $(CONFIG)/os/CONFIG.cygwin-x86.cygwin-x86
 
-CROSS_OPT = NO
+BUILD_CLASS = HOST
+
+HOST_OPT = NO
diff --git a/configure/os/CONFIG.win32-x86-cygwin.win32-x86-cygwin-debug b/configure/os/CONFIG.win32-x86-cygwin.win32-x86-cygwin-debug
index 7242c09ad..c3b0f6748 100644
--- a/configure/os/CONFIG.win32-x86-cygwin.win32-x86-cygwin-debug
+++ b/configure/os/CONFIG.win32-x86-cygwin.win32-x86-cygwin-debug
@@ -10,4 +10,5 @@
 include $(CONFIG)/os/CONFIG.Common.win32-x86-cygwin
 include $(CONFIG)/os/CONFIG.win32-x86-cygwin.win32-x86-cygwin
 
-CROSS_OPT=NO
+BUILD_CLASS=HOST
+HOST_OPT=NO
diff --git a/configure/os/CONFIG.win32-x86-mingw.win32-x86-mingw-debug b/configure/os/CONFIG.win32-x86-mingw.win32-x86-mingw-debug
index f8a346ae6..c181f1c05 100644
--- a/configure/os/CONFIG.win32-x86-mingw.win32-x86-mingw-debug
+++ b/configure/os/CONFIG.win32-x86-mingw.win32-x86-mingw-debug
@@ -10,4 +10,6 @@
 include $(CONFIG)/os/CONFIG.Common.win32-x86-mingw
 include $(CONFIG)/os/CONFIG.win32-x86-mingw.win32-x86-mingw
 
-CROSS_OPT=NO
+BUILD_CLASS = HOST
+
+HOST_OPT=NO