diff --git a/setup.py b/setup.py
index 35b4e125cd..af48f1c16c 100644
--- a/setup.py
+++ b/setup.py
@@ -1049,21 +1049,14 @@ cythonopts = {
     'c_string_type': 'bytes',
 }
 
-cythonmodules = [
+extmodules += cythonize([
+    Extension('mercurial.cyext.clindex',
+              sources=['mercurial/cyext/clindex.pyx'],
+              extra_compile_args=filter(None, [STDC99, PRODUCEDEBUGSYMBOLS])),
     Extension('mercurial.cyext.linelog',
               sources=['mercurial/cyext/linelog.pyx'],
-              extra_compile_args=filter(None, [STDC99]))
-]
-
-if not iswindows:
-    cythonmodules += [
-        Extension('mercurial.cyext.clindex',
-                  sources=['mercurial/cyext/clindex.pyx'],
-                  extra_compile_args=filter(None, [STDC99])),
-    ]
-
-for cm in cythonmodules:
-    extmodules += cythonize(cm, compiler_directives=cythonopts)
+              extra_compile_args=filter(None, [STDC99, PRODUCEDEBUGSYMBOLS])),
+], compiler_directives=cythonopts)
 
 libraries = [
     ("datapack", {