Index: build/get-py-info.py
===================================================================
--- build/get-py-info.py	(revision 15939)
+++ build/get-py-info.py	(working copy)
@@ -57,14 +57,14 @@
         libs_elems.append(ldshared_elems[i])
     elif ldshared_elems[i][:2] == '-l':
       libs_elems.append(ldshared_elems[i])
-  if sys.platform[:6] == 'cygwin':
-    py_Lopt = "-L" + os.path.join(sys.prefix, "lib", "python" +
-        sysconfig.get_python_version(), "config")
-    py_lopt = "-lpython" + sysconfig.get_python_version()
-    libs_elems.append(py_Lopt)
-    libs_elems.append(py_lopt)
-    ldshared_elems.append(py_Lopt)
-    ldshared_elems.append(py_lopt)
+  python_version = sys.version[:3]
+  py_Lopt = "-L" + os.path.join(sys.prefix, "lib", "python" +
+      python_version, "config")
+  py_lopt = "-lpython" + python_version
+  libs_elems.append(py_Lopt)
+  libs_elems.append(py_lopt)
+  ldshared_elems.append(py_Lopt)
+  ldshared_elems.append(py_lopt)
   if just_libs:
     return string.join(libs_elems, " ")
   else: