Files
MINGW-packages/mingw-w64-python3/0970-Add-AMD64-to-sys-config-so-msvccompiler-get_build_version-works.patch
2016-07-12 14:49:26 +03:00

28 lines
896 B
Diff

diff -Naur Python-3.5.2-orig/Python/getcompiler.c Python-3.5.2/Python/getcompiler.c
--- Python-3.5.2-orig/Python/getcompiler.c 2016-06-26 00:38:38.000000000 +0300
+++ Python-3.5.2/Python/getcompiler.c 2016-07-12 14:23:05.404300700 +0300
@@ -6,7 +6,22 @@
#ifndef COMPILER
#ifdef __GNUC__
-#define COMPILER "\n[GCC " __VERSION__ "]"
+/* To not break compatibility with things that determine
+ CPU arch by calling get_build_version in msvccompiler.py
+ (such as NumPy) add "32 bit" or "64 bit (AMD64)" on Windows
+ and also use a space as a separator rather than a newline. */
+#if defined(_WIN32)
+#define COMP_SEP " "
+#if defined(__x86_64__)
+#define ARCH_SUFFIX " 64 bit (AMD64)"
+#else
+#define ARCH_SUFFIX " 32 bit"
+#endif
+#else
+#define COMP_SEP "\n"
+#define ARCH_SUFFIX ""
+#endif
+#define COMPILER COMP_SEP "[GCC " __VERSION__ ARCH_SUFFIX "]"
#endif
#endif /* !COMPILER */