mirror of
https://github.com/vale981/ray
synced 2025-03-06 10:31:39 -05:00
63 lines
2.3 KiB
Diff
63 lines
2.3 KiB
Diff
diff --git third_party/py/python_configure.bzl third_party/py/python_configure.bzl
|
|
--- third_party/py/python_configure.bzl
|
|
+++ third_party/py/python_configure.bzl
|
|
@@ -177,7 +177,7 @@ def _get_bash_bin(repository_ctx):
|
|
if bash_bin != None:
|
|
return bash_bin
|
|
else:
|
|
- bash_bin_path = repository_ctx.which("bash")
|
|
+ bash_bin_path = repository_ctx.which("bash" if not _is_windows(repository_ctx) else "sh.exe")
|
|
if bash_bin_path != None:
|
|
return str(bash_bin_path)
|
|
else:
|
|
@@ -208,7 +208,7 @@ def _get_python_lib(repository_ctx, python_bin, lib_path_key):
|
|
" paths.append(path)\n" + "if len(paths) >=1:\n" +
|
|
" print(paths[0])\n" + "END"
|
|
)
|
|
- cmd = "%s - %s" % (python_bin, print_lib)
|
|
+ cmd = '"%s" - %s' % (python_bin, print_lib)
|
|
result = repository_ctx.execute([_get_bash_bin(repository_ctx), "-c", cmd])
|
|
return result.stdout.strip("\n")
|
|
|
|
@@ -293,11 +293,13 @@ def _create_single_version_package(
|
|
|
|
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
|
|
+ _check_python_bin(
|
|
+ repository_ctx,
|
|
+ python_bin,
|
|
+ bin_path_key,
|
|
+ allow_absent,
|
|
+ ) == None) and allow_absent:
|
|
+ python_include_rule = empty_include_rule
|
|
else:
|
|
python_lib = _get_python_lib(repository_ctx, python_bin, lib_path_key)
|
|
_check_python_lib(repository_ctx, python_lib)
|
|
@@ -348,17 +350,17 @@ def _python_autoconf_impl(repository_ctx):
|
|
repository_ctx,
|
|
"_python2",
|
|
_PYTHON2_BIN_PATH,
|
|
- "python2",
|
|
+ "python" if not _is_windows(repository_ctx) else "python.exe",
|
|
_PYTHON2_LIB_PATH,
|
|
- True
|
|
+ True,
|
|
)
|
|
_create_single_version_package(
|
|
repository_ctx,
|
|
"_python3",
|
|
_PYTHON3_BIN_PATH,
|
|
- "python3",
|
|
+ "python3" if not _is_windows(repository_ctx) else "python.exe",
|
|
_PYTHON3_LIB_PATH,
|
|
- False
|
|
+ False,
|
|
)
|
|
_tpl(repository_ctx, "BUILD")
|
|
|
|
--
|