diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-06-21 07:55:31 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-06-21 07:55:31 +0200 |
| commit | 39fa0bace059116d9a45e09fcd18691390b166bd (patch) | |
| tree | 77f5abf2964bd92dc9e338654a4ffaaffc24d9ce /src/setup.py | |
| parent | f9b0c331d8b9d03be91b56e324f59424af45302b (diff) | |
| parent | f7e5d2b46b03cc4bc09c38f7e0873378bb9c3b78 (diff) | |
Merge tag 'upstream/2.3.5'
Upstream version 2.3.5
Diffstat (limited to 'src/setup.py')
| -rw-r--r-- | src/setup.py | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/setup.py b/src/setup.py index 09c32bb..efb0034 100644 --- a/src/setup.py +++ b/src/setup.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2001 - 2014 The SCons Foundation +# Copyright (c) 2001 - 2015 The SCons Foundation # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -32,13 +32,13 @@ NOTE: Installed SCons is not importable like usual Python packages. It is below is dedicated to make it happen on various platforms. """ -__revision__ = "src/setup.py 2014/09/27 12:51:43 garyo" +__revision__ = "src/setup.py pchdll:3325:cd517fae59a4 2015/06/18 06:53:27 bdbaddog" import os import stat import sys -Version = "2.3.4" +Version = "2.3.5" man_pages = [ 'scons.1', @@ -81,6 +81,16 @@ import distutils.command.install_data import distutils.command.install_lib import distutils.command.install_scripts import distutils.command.build_scripts +import distutils.msvccompiler + +def get_build_version(): + """ monkey patch distutils msvc version if we're not on windows. + We need to use vc version 9 for python 2.7.x and it defaults to 6 + for non-windows platforms and there is no way to override it besides + monkey patching""" + return 9 + +distutils.msvccompiler.get_build_version = get_build_version _install = distutils.command.install.install _install_data = distutils.command.install_data.install_data |