diff --git a/python.jam b/python.jam
index 0e9f60b38..49aa750d8 100644
--- a/python.jam
+++ b/python.jam
@@ -22,7 +22,9 @@ PYTHON_VERSION_NODOT
 
 local RUN_PATH = $(RUN_PATH) ;
 
-gcc-compilers = gcc gcc-stlport ;
+# Decide which toolsets should be treated like an ordinary (unix) GCC installation
+gcc-compilers = [ MATCH ^(gcc.*)$ : $(TOOLS) ] ;
+gcc-compilers = [ difference $(gcc-compilers) : gcc-nocygwin ] ;
 
 if $(NT)
 {
diff --git a/v1/python.jam b/v1/python.jam
index 0e9f60b38..49aa750d8 100644
--- a/v1/python.jam
+++ b/v1/python.jam
@@ -22,7 +22,9 @@ PYTHON_VERSION_NODOT
 
 local RUN_PATH = $(RUN_PATH) ;
 
-gcc-compilers = gcc gcc-stlport ;
+# Decide which toolsets should be treated like an ordinary (unix) GCC installation
+gcc-compilers = [ MATCH ^(gcc.*)$ : $(TOOLS) ] ;
+gcc-compilers = [ difference $(gcc-compilers) : gcc-nocygwin ] ;
 
 if $(NT)
 {