--- Python-2.6.4/Lib/distutils/unixccompiler.py	2009-09-09 10:34:06.000000000 +0200
+++ Python-2.6.4/Lib/distutils/unixccompiler.py	2010-02-26 12:39:31.000000000 +0100
@@ -244,11 +244,10 @@
                     # settings.
                     i = 0
                     if os.path.basename(linker[0]) == "env":
-                        i = 1
-                        while '=' in linker[i]:
-                            i = i + 1
+                        while '=' != linker.pop(0):
+                            pass
 
-                    linker[i] = self.compiler_cxx[i]
+                    linker = self.compiler_cxx
 
                 if sys.platform == 'darwin':
                     linker = _darwin_compiler_fixup(linker, ld_args)