You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
24 lines
1.3 KiB
24 lines
1.3 KiB
Index: scripts/bootstrap/bootstrap.sh |
|
--- scripts/bootstrap/bootstrap.sh.orig 2018-06-01 16:28:58.899538000 +0200 |
|
+++ scripts/bootstrap/bootstrap.sh 2018-06-01 16:29:39.054422000 +0200 |
|
@@ -35,7 +35,7 @@ |
|
--host_java_toolchain=//src/java_tools/buildjar:bootstrap_toolchain \ |
|
--spawn_strategy=standalone \ |
|
--nojava_header_compilation \ |
|
- --strategy=Javac=worker --worker_quit_after_build --ignore_unsupported_sandboxing \ |
|
+ --strategy=Javac=standalone --ignore_unsupported_sandboxing \ |
|
--compilation_mode=opt \ |
|
--experimental_distdir=derived/distdir \ |
|
${EXTRA_BAZEL_ARGS:-}" |
|
Index: src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt |
|
--- src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt.orig 1980-01-01 00:00:00.000000000 +0100 |
|
+++ src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt 2018-06-01 16:28:58.899816000 +0200 |
|
@@ -38,7 +38,7 @@ |
|
|
|
# Find a file in a given search path. |
|
def SearchPath(name): |
|
- search_path = os.getenv('PATH', os.defpath).split(os.pathsep) |
|
+ search_path = os.getenv('PATH', os.defpath + ":@l_prefix@/bin").split(os.pathsep) |
|
for directory in search_path: |
|
if directory == '': continue |
|
path = os.path.join(directory, name)
|
|
|