From 0c83e2408b81ec62e8eb787b01518ccb46236fc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Wed, 16 May 2018 10:50:52 +0300 Subject: Select correct Python environment when cross compiling To be able to create 32 bit wheel in 64 bit Windows, we must use correct Python version. Task-number: PYSIDE-646 Change-Id: I72c05e9c5b6f37f16c118e36c3c7ea8f90ee7dff Reviewed-by: Alexandru Croitor --- build_scripts/utils.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'build_scripts') diff --git a/build_scripts/utils.py b/build_scripts/utils.py index 8ce1b8a51..2dffd345c 100644 --- a/build_scripts/utils.py +++ b/build_scripts/utils.py @@ -1086,16 +1086,24 @@ def install_pip_dependencies(env_pip, packages): for p in packages: run_instruction([env_pip, "install", p], "Failed to install " + p) -def get_qtci_virtualEnv(python_ver, host): +def get_qtci_virtualEnv(python_ver, host, hostArch, targetArch): _pExe = "python" _env = "env" + str(python_ver) env_python = _env + "/bin/python" env_pip = _env + "/bin/pip" if host == "Windows": + print("New virtualenv to build " + targetArch + " in " + hostArch + " host.") _pExe = "python.exe" - if python_ver == "3": - _pExe = os.path.join(os.getenv("PYTHON3_PATH"), "python.exe") + # With windows we are creating building 32-bit target in 64-bit host + if hostArch == "X86_64" and targetArch == "X86": + if python_ver == "3": + _pExe = os.path.join(os.getenv("PYTHON3_32_PATH"), "python.exe") + else: + _pExe = os.path.join(os.getenv("PYTHON2_32_PATH"), "python.exe") + else: + if python_ver == "3": + _pExe = os.path.join(os.getenv("PYTHON3_PATH"), "python.exe") env_python = _env + "\\Scripts\\python.exe" env_pip = _env + "\\Scripts\\pip.exe" else: -- cgit v1.2.3