From 07ad4e66566a6bff8f521dc1a4537f2852efdeba Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Fri, 4 Aug 2017 12:58:40 +0200 Subject: [PATCH] Fix build environment when building with MSVC 2015 32 bit --- scripts/jenkins.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/jenkins.py b/scripts/jenkins.py index 35cadadb3..0e624660b 100644 --- a/scripts/jenkins.py +++ b/scripts/jenkins.py @@ -214,7 +214,11 @@ class MSVCBuilder(Builder): def _specific_prepare(self): os.environ['PATH'] += os.pathsep + self._get_externals_path() os.environ['PATH'] += os.pathsep + 'C:/Program Files/7-Zip' - vs_env = get_vs_env('14.0', 'amd64') + if self.word_size == '32': + vs_env = get_vs_env('14.0', 'x86') + else: + vs_env = get_vs_env('14.0', 'amd64') + os.environ.update(vs_env) def _get_qmake_spec(self):