Fix error with default python path selection (#11814)

* Fix error with default python path selection

* Move setting of environment var outside if / else
This commit is contained in:
David Norman 2017-07-27 18:38:12 +01:00 committed by Vijay Vasudevan
parent b26f9cd44b
commit 3cd828474f

View File

@ -175,7 +175,7 @@ def setup_python(environ_cp):
if not python_lib_path: if not python_lib_path:
python_lib_paths = get_python_path(environ_cp) python_lib_paths = get_python_path(environ_cp)
if environ_cp.get('USE_DEFAULT_PYTHON_LIB_PATH') == '1': if environ_cp.get('USE_DEFAULT_PYTHON_LIB_PATH') == '1':
environ_cp['PYTHON_LIB_PATH'] = python_lib_paths[0] python_lib_path = python_lib_paths[0]
else: else:
print('Found possible Python library paths:\n%s' % print('Found possible Python library paths:\n%s' %
'\n'.join(python_lib_paths)) '\n'.join(python_lib_paths))
@ -185,7 +185,7 @@ def setup_python(environ_cp):
% python_lib_paths[0]) % python_lib_paths[0])
if not python_lib_path: if not python_lib_path:
python_lib_path = default_python_lib_path python_lib_path = default_python_lib_path
environ_cp['PYTHON_LIB_PATH'] = python_lib_path environ_cp['PYTHON_LIB_PATH'] = python_lib_path
python_major_version = sys.version_info[0] python_major_version = sys.version_info[0]
# Convert python path to Windows style before writing into bazel.rc # Convert python path to Windows style before writing into bazel.rc