summaryrefslogtreecommitdiff
path: root/python/modules
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2016-12-28 17:00:45 -0500
committerJoe George <joe@zeroc.com>2016-12-28 17:00:45 -0500
commit53ac8a71979a1520ff3438c01bb114c411ef4fb6 (patch)
tree4edcd1a44bed1e226d58e4879d1788245b338da1 /python/modules
parentFix ICE-7473 - dynamic_cast error on macOS (diff)
downloadice-53ac8a71979a1520ff3438c01bb114c411ef4fb6.tar.bz2
ice-53ac8a71979a1520ff3438c01bb114c411ef4fb6.tar.xz
ice-53ac8a71979a1520ff3438c01bb114c411ef4fb6.zip
Update Python build to support 3.6
Diffstat (limited to 'python/modules')
-rw-r--r--python/modules/IcePy/Makefile.mak8
1 files changed, 4 insertions, 4 deletions
diff --git a/python/modules/IcePy/Makefile.mak b/python/modules/IcePy/Makefile.mak
index e35d6423c55..2864394186b 100644
--- a/python/modules/IcePy/Makefile.mak
+++ b/python/modules/IcePy/Makefile.mak
@@ -36,20 +36,20 @@ OBJS = .\BatchRequestInterceptor.obj \
.\Util.obj
#
-# Get Make.common.rules.mak to figure out CPP_COMPILER by setting it
-# to "auto"
+# Get Make.common.rules.mak to determine CPP_COMPILER by setting it to 'auto'
#
CPP_COMPILER=auto
!include $(top_srcdir)\config\Make.rules.mak
-!if exist ($(PYTHON_HOME)\python35.dll)
+!if ([$(PYTHON_HOME)\python.exe -c "import sys;print(sys.version_info >= (3, 5))" | findstr "True" > nul] == 0)
REQUIRED_COMPILER = VC140
!else
REQUIRED_COMPILER = VC100
!endif
+
#
-# Ensure we're using VC100
+# Ensure we are using the right compiler
#
!if "$(CPP_COMPILER)" != "$(REQUIRED_COMPILER)"
!error Invalid CPP_COMPILER setting: $(CPP_COMPILER). Must be set to $(REQUIRED_COMPILER).