From f14b8ef18b16dec143f7266719f149e977ba27d4 Mon Sep 17 00:00:00 2001 From: Richard Belleville Date: Thu, 15 Oct 2020 16:13:20 -0700 Subject: [PATCH] Clean up conditional --- third_party/py/python_configure.bzl | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/third_party/py/python_configure.bzl b/third_party/py/python_configure.bzl index 5be5560ef1e..88fcb1006fb 100644 --- a/third_party/py/python_configure.bzl +++ b/third_party/py/python_configure.bzl @@ -291,15 +291,14 @@ def _create_single_version_package( """Creates the repository containing files set up to build with Python.""" empty_include_rule = "filegroup(\n name=\"{}_include\",\n srcs=[],\n)".format(variety_name) - # A for loop is used in place of a (non-existent in Starlark) goto. - for _ in [None]: - python_bin = _get_python_bin(repository_ctx, bin_path_key, default_bin_path, allow_absent) - if python_bin == None and allow_absent: + python_bin = _get_python_bin(repository_ctx, bin_path_key, default_bin_path, allow_absent) + if (python_bin == None or + _check_python_bin(repository_ctx, + python_bin, + bin_path_key, + allow_absent) == None) and allow_absent: python_include_rule = empty_include_rule - break - if _check_python_bin(repository_ctx, python_bin, bin_path_key, allow_absent) == None and allow_absent: - python_include_rule = empty_include_rule - break + else: python_lib = _get_python_lib(repository_ctx, python_bin, lib_path_key) _check_python_lib(repository_ctx, python_lib) python_include = _get_python_include(repository_ctx, python_bin)