diff options
| author |   Zachary Ware <zachary.ware@gmail.com> | 2015-08-29 00:13:14 -0500 |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2015-08-29 00:13:14 -0500 |
| commit | 95c0646547177a2e6a1f9bb24c4e45c0c42038a1 (patch) | |
| tree | f68adb690d3eabf9fe09f156f248a8995a94b372 /PC | |
| parent | Fixed typos in TZ format description (diff) | |
| parent | Issue #24953: Include ICC version in sys.version string when bulit with ICC o... (diff) | |
| download | cpython-95c0646547177a2e6a1f9bb24c4e45c0c42038a1.tar.gz cpython-95c0646547177a2e6a1f9bb24c4e45c0c42038a1.tar.bz2 cpython-95c0646547177a2e6a1f9bb24c4e45c0c42038a1.zip | |
Closes #24953: Merge with 3.5
Diffstat (limited to 'PC')
| -rw-r--r-- | PC/pyconfig.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/PC/pyconfig.h b/PC/pyconfig.h index 40c93053be7..88611480617 100644 --- a/PC/pyconfig.h +++ b/PC/pyconfig.h @@ -147,7 +147,11 @@ WIN32 is still required for the locale module. #define MS_WINI64 #define PYD_PLATFORM_TAG "win_ia64" #elif defined(_M_X64) || defined(_M_AMD64) +#if defined(__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 #define PYD_PLATFORM_TAG "win_amd64" #else @@ -194,7 +198,11 @@ typedef _W64 int ssize_t; #if defined(MS_WIN32) && !defined(MS_WIN64) #if defined(_M_IX86) +#if defined(__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 */ #define PYD_PLATFORM_TAG "win32" #elif defined(_M_ARM) #define COMPILER _Py_PASTE_VERSION("32 bit (ARM)") |