diff options
| author |  cpeyser <cpeyser@google.com> | 2017-08-28 22:43:32 +0200 |
|---|---|---|
| committer |  Vladimir Moskva <vladmos@google.com> | 2017-08-29 13:32:14 +0200 |
| commit | 03755ea2a9830d94fdb23baa3b37bb11c2faa392 (patch) | |
| tree | 0884dfe0d360aed55e8febc2b02d1271a71894d7 /src/create_embedded_tools.py | |
| parent | 8c76d5f82d290b46d67189bcc8bd08a441094da1 (diff) | |
Automated rollback of commit 363413110f3a63a11d900864be1852adbaed2899.
*** Reason for rollback ***
Breaks //src/test/shell/bazel:bazel_bootstrap_distfile_test:
INFO: You can skip this first step by providing a path to the bazel binary as second argument:
INFO: ./compile.sh compile /path/to/bazel
🍃 Building Bazel from scratch......
🍃 Building Bazel with Bazel.
.WARNING: /tmp/bazel_cHivhPBc/out/external/bazel_tools/WORKSPACE:1: Workspace name in /tmp/bazel_cHivhPBc/out/external/bazel_tools/WORKSPACE (@io_bazel) does not match the name given in the repository's definition (@bazel_tools); this will cause a build error in future versions.
ERROR: in target '//external:cc_toolchain': error loading package '@local_config_cc//': Extension file not found. Unable to load file '@local_config_cc//:dummy_toolchain.bzl': file doesn't exist or isn't a file.
INFO: Elapsed time: 3.343s
ERROR: Could not build Bazel
Found by git bisect.
*** Original change description ***
Add a new toolchain type for c++. In order to do this, PlatformConfiguration is made a legal configuration fragment for every rule class.
Add a default "dummy" c++ toolchain to prevent resolution errors when legacy toolchain selection logic is used. Add toolchain mocks to java and shell tests.
PiperOrigin-RevId: 166750885
Diffstat (limited to 'src/create_embedded_tools.py')
| -rw-r--r-- | src/create_embedded_tools.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/create_embedded_tools.py b/src/create_embedded_tools.py index 668db213fe..699edd09f5 100644 --- a/src/create_embedded_tools.py +++ b/src/create_embedded_tools.py @@ -29,8 +29,8 @@ from src.create_embedded_tools_lib import is_executable output_paths = [ ('*tools/jdk/BUILD*', lambda x: 'tools/jdk/BUILD'), - ('*tools/platforms/platforms.BUILD', lambda x: 'tools/platforms/BUILD'), - ('*tools/platforms/*', lambda x: 'tools/platforms/' + os.path.basename(x)), + ('*tools/platforms/platforms.BUILD', lambda x: 'platforms/BUILD'), + ('*tools/platforms/*', lambda x: 'platforms/' + os.path.basename(x)), ('*JavaBuilder*_deploy.jar', lambda x: 'tools/jdk/' + os.path.basename(x)), ('*JacocoCoverage*_deploy.jar', lambda x: 'tools/jdk/JacocoCoverage_deploy.jar'), |