summaryrefslogtreecommitdiffstats
path: root/PC
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2015-08-29 04:52:31 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2015-08-29 04:52:31 (GMT)
commitd155d72c1ecaf5d75191bbae04c0664f016cd4a7 (patch)
tree0326d7f2d9453a6246f23388924a95bf84ef81a8 /PC
parent34eab0785bee18498a5489e8748d25ddf5b6181d (diff)
downloadcpython-d155d72c1ecaf5d75191bbae04c0664f016cd4a7.zip
cpython-d155d72c1ecaf5d75191bbae04c0664f016cd4a7.tar.gz
cpython-d155d72c1ecaf5d75191bbae04c0664f016cd4a7.tar.bz2
Issue #24953: Include ICC version in sys.version string when bulit with ICC on Windows
Diffstat (limited to 'PC')
-rw-r--r--PC/pyconfig.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/PC/pyconfig.h b/PC/pyconfig.h
index a49ce69..53c8289 100644
--- a/PC/pyconfig.h
+++ b/PC/pyconfig.h
@@ -148,7 +148,11 @@ WIN32 is still required for the locale module.
#define COMPILER _Py_PASTE_VERSION("64 bit (Itanium)")
#define MS_WINI64
#elif defined(_M_X64) || defined(_M_AMD64)
+#ifdef __INTEL_COMPILER
+#define COMPILER ("[ICC v." _Py_STRINGIZE(__INTEL_COMPILER) " 64 bit (amd64) with MSC v." _Py_STRINGIZE(_MSC_VER) " CRT]")
+#else
#define COMPILER _Py_PASTE_VERSION("64 bit (AMD64)")
+#endif /* __INTEL_COMPILER */
#define MS_WINX64
#else
#define COMPILER _Py_PASTE_VERSION("64 bit (Unknown)")
@@ -204,7 +208,11 @@ typedef _W64 int ssize_t;
#if defined(MS_WIN32) && !defined(MS_WIN64)
#ifdef _M_IX86
+#ifdef __INTEL_COMPILER
+#define COMPILER ("[ICC v." _Py_STRINGIZE(__INTEL_COMPILER) " 32 bit (Intel) with MSC v." _Py_STRINGIZE(_MSC_VER) " CRT]")
+#else
#define COMPILER _Py_PASTE_VERSION("32 bit (Intel)")
+#endif /* __INTEL_COMPILER */
#else
#define COMPILER _Py_PASTE_VERSION("32 bit (Unknown)")
#endif