Refactor msvc runtime checking, put it into mingw32compiler

1 files changed, 13 insertions, 0 deletions

diff --git a/numpy/distutils/mingw32ccompiler.py b/numpy/distutils/mingw32ccompiler.py
index 3027fba9a..a62be27a4 100644
--- a/numpy/distutils/mingw32ccompiler.py
+++ b/numpy/distutils/mingw32ccompiler.py
@@ -294,3 +294,16 @@ def manifest_rc(name, type='dll'):
     return """\
 #include "winuser.h"
 %d RT_MANIFEST %s""" % (rctype, name)
+
+def check_embedded_msvcr_match_linked(msver):
+    """msver is the ms runtime version used for the MANIFEST."""
+    # check msvcr major version are the same for linking and
+    # embedding
+    msvcv = msvc_runtime_library()
+    if msvcv:
+        maj = msvcv[5:6]
+        if not maj == int(msver):
+            raise ValueError, 
+                  "Dyscrepancy between linked msvcr " \
+                  "(%f) and the one about to be embedded " \
+                  "(%f)" % (int(msver), maj)