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 /tools/platforms | |
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 'tools/platforms')
-rw-r--r-- | tools/platforms/BUILD | 92 |
1 files changed, 0 insertions, 92 deletions
diff --git a/tools/platforms/BUILD b/tools/platforms/BUILD index 1b74f106eb..4e788aea2c 100644 --- a/tools/platforms/BUILD +++ b/tools/platforms/BUILD @@ -13,95 +13,3 @@ filegroup( name = "srcs", srcs = glob(["**"]), ) - -# These match values in //src/main/java/com/google/build/lib/util:CPU.java -constraint_setting(name = "cpu") - -constraint_value( - name = "x86_32", - constraint_setting = ":cpu", -) - -constraint_value( - name = "x86_64", - constraint_setting = ":cpu", -) - -constraint_value( - name = "ppc", - constraint_setting = ":cpu", -) - -constraint_value( - name = "arm", - constraint_setting = ":cpu", -) - -constraint_value( - name = "s390x", - constraint_setting = ":cpu", -) - -# These match values in //src/main/java/com/google/build/lib/util:OS.java -constraint_setting(name = "os") - -constraint_value( - name = "osx", - constraint_setting = ":os", -) - -constraint_value( - name = "freebsd", - constraint_setting = ":os", -) - -constraint_value( - name = "linux", - constraint_setting = ":os", -) - -constraint_value( - name = "windows", - constraint_setting = ":os", -) - -# A default platform with nothing defined. -platform(name = "default_platform") - -# A default platform referring to the host system. This only exists for -# internal build configurations, and so shouldn't be accessed by other packages. -platform( - name = "host_platform", - cpu_constraints = [ - ":x86_32", - ":x86_64", - ":ppc", - ":arm", - ":s390x", - ], - host_platform = True, - os_constraints = [ - ":osx", - ":freebsd", - ":linux", - ":windows", - ], -) - -platform( - name = "target_platform", - cpu_constraints = [ - ":x86_32", - ":x86_64", - ":ppc", - ":arm", - ":s390x", - ], - os_constraints = [ - ":osx", - ":freebsd", - ":linux", - ":windows", - ], - target_platform = True, -) |