diff options
author | Yun Peng <pcloudy@google.com> | 2018-01-12 09:13:10 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-01-12 09:15:08 -0800 |
commit | c924cf6f464cf24ac6ba4fb1c1d34aa2fe567e3f (patch) | |
tree | d6a4b6bdca32ba5d900539307ef5ce485d6a5a85 /src/main | |
parent | d4c19e65c9e219772d22720761ef7646cdb210f8 (diff) |
Clean up Windows config_settings
1.Deleted config_setting for --cpu=x64_windows_msys, because we don't build
Bazel with MSYS gcc anymore.
2.Deleted config_setting for --cpu=x64_windows_msvc, because it uses exactly
the same toolchain as --cpu=x64_windows, it'll be removed in the future.
This change reduces the complexity of our BUILD files and make them less
confusing.
Change-Id: I939831a6861413b0f745fb1be98aacd4fb780e0a
PiperOrigin-RevId: 181751853
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/cpp/BUILD | 13 | ||||
-rw-r--r-- | src/main/cpp/util/BUILD | 10 | ||||
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/BUILD | 2 | ||||
-rw-r--r-- | src/main/native/BUILD | 1 | ||||
-rw-r--r-- | src/main/tools/BUILD | 7 | ||||
-rw-r--r-- | src/main/tools/jdk.BUILD | 19 |
6 files changed, 1 insertions, 51 deletions
diff --git a/src/main/cpp/BUILD b/src/main/cpp/BUILD index 052b01a32e..82b7859e90 100644 --- a/src/main/cpp/BUILD +++ b/src/main/cpp/BUILD @@ -33,12 +33,6 @@ cc_library( "//src/conditions:windows": [ "blaze_util_windows.cc", ], - "//src/conditions:windows_msys": [ - "blaze_util_windows.cc", - ], - "//src/conditions:windows_msvc": [ - "blaze_util_windows.cc", - ], "//conditions:default": [ "blaze_util_linux.cc", "blaze_util_posix.cc", @@ -58,7 +52,6 @@ cc_library( "//src/conditions:freebsd": [ ], "//src/conditions:windows": WIN_LINK_OPTS, - "//src/conditions:windows_msvc": WIN_LINK_OPTS, "//conditions:default": [ "-lrt", ], @@ -68,8 +61,6 @@ cc_library( "//src/main/cpp/util:blaze_exit_code", ] + select({ "//src/conditions:windows": ["//src/main/native/windows:lib-file"], - "//src/conditions:windows_msys": ["//src/main/native/windows:lib-file"], - "//src/conditions:windows_msvc": ["//src/main/native/windows:lib-file"], "//conditions:default": [], }), ) @@ -84,12 +75,10 @@ cc_binary( "main.cc", ] + select({ "//src/conditions:windows": ["//src/main/native/windows:resources.o"], - "//src/conditions:windows_msvc": ["//src/main/native/windows:resources.o"], "//conditions:default": [], }), copts = select({ "//src/conditions:windows": ["/wd4018"], - "//src/conditions:windows_msvc": ["/wd4018"], "//conditions:default": ["-Wno-sign-compare"], }), linkopts = select({ @@ -101,7 +90,7 @@ cc_binary( "-lprocstat", "-lm", ], - "//src/conditions:windows_msvc": [ + "//src/conditions:windows": [ ], "//conditions:default": [ "-lrt", diff --git a/src/main/cpp/util/BUILD b/src/main/cpp/util/BUILD index 4dd12cdbc8..0c97a045e5 100644 --- a/src/main/cpp/util/BUILD +++ b/src/main/cpp/util/BUILD @@ -35,12 +35,6 @@ cc_library( "//src/conditions:windows": [ "file_windows.cc", ], - "//src/conditions:windows_msys": [ - "file_windows.cc", - ], - "//src/conditions:windows_msvc": [ - "file_windows.cc", - ], "//conditions:default": [ "file_posix.cc", ], @@ -62,8 +56,6 @@ cc_library( ":strings", ] + select({ "//src/conditions:windows": ["//src/main/native/windows:lib-file"], - "//src/conditions:windows_msys": ["//src/main/native/windows:lib-file"], - "//src/conditions:windows_msvc": ["//src/main/native/windows:lib-file"], "//conditions:default": [], }), ) @@ -72,8 +64,6 @@ cc_library( name = "errors", srcs = ["errors.cc"] + select({ "//src/conditions:windows": ["errors_windows.cc"], - "//src/conditions:windows_msys": ["errors_windows.cc"], - "//src/conditions:windows_msvc": ["errors_windows.cc"], "//conditions:default": ["errors_posix.cc"], }), hdrs = ["errors.h"], diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD index ee1d54818f..5f5ff0a255 100644 --- a/src/main/java/com/google/devtools/build/lib/BUILD +++ b/src/main/java/com/google/devtools/build/lib/BUILD @@ -79,8 +79,6 @@ java_library( resources = select({ # todo(dslomov): Get rid of this whole library on Windows. "//src/conditions:windows": [], - "//src/conditions:windows_msys": [], - "//src/conditions:windows_msvc": [], "//conditions:default": ["//src/main/native:libunix.so"], }), deps = [ diff --git a/src/main/native/BUILD b/src/main/native/BUILD index ea7038524a..c65b29c7a2 100644 --- a/src/main/native/BUILD +++ b/src/main/native/BUILD @@ -5,7 +5,6 @@ genrule( "//src/conditions:darwin_x86_64": ["//tools/jdk:jni_md_header-darwin"], "//src/conditions:freebsd": ["//tools/jdk:jni_md_header-freebsd"], "//src/conditions:windows": ["//tools/jdk:jni_md_header-windows"], - "//src/conditions:windows_msvc": ["//tools/jdk:jni_md_header-windows"], "//conditions:default": ["//tools/jdk:jni_md_header-linux"], }), outs = ["jni_md.h"], diff --git a/src/main/tools/BUILD b/src/main/tools/BUILD index b6250a20d4..e96155302d 100644 --- a/src/main/tools/BUILD +++ b/src/main/tools/BUILD @@ -20,7 +20,6 @@ cc_binary( name = "process-wrapper", srcs = select({ "//src/conditions:windows": ["process-wrapper-windows.cc"], - "//src/conditions:windows_msvc": ["process-wrapper-windows.cc"], "//conditions:default": [ "process-wrapper.cc", "process-wrapper.h", @@ -33,7 +32,6 @@ cc_binary( linkopts = ["-lm"], deps = select({ "//src/conditions:windows": [], - "//src/conditions:windows_msvc": [], "//conditions:default": [ ":process-tools", ":logging", @@ -45,7 +43,6 @@ cc_binary( name = "build-runfiles", srcs = select({ "//src/conditions:windows": ["build-runfiles-windows.cc"], - "//src/conditions:windows_msvc": ["build-runfiles-windows.cc"], "//conditions:default": ["build-runfiles.cc"], }), ) @@ -57,8 +54,6 @@ cc_binary( "//src/conditions:darwin_x86_64": ["dummy-sandbox.c"], "//src/conditions:freebsd": ["dummy-sandbox.c"], "//src/conditions:windows": ["dummy-sandbox.c"], - "//src/conditions:windows_msys": ["dummy-sandbox.c"], - "//src/conditions:windows_msvc": ["dummy-sandbox.c"], "//conditions:default": [ "linux-sandbox.cc", "linux-sandbox.h", @@ -74,8 +69,6 @@ cc_binary( "//src/conditions:darwin_x86_64": [], "//src/conditions:freebsd": [], "//src/conditions:windows": [], - "//src/conditions:windows_msys": [], - "//src/conditions:windows_msvc": [], "//conditions:default": [ ":logging", ":process-tools", diff --git a/src/main/tools/jdk.BUILD b/src/main/tools/jdk.BUILD index 6726e0424f..48df3b6e7e 100644 --- a/src/main/tools/jdk.BUILD +++ b/src/main/tools/jdk.BUILD @@ -29,8 +29,6 @@ filegroup( name = "java", srcs = select({ ":windows" : ["bin/java.exe"], - ":windows_msys" : ["bin/java.exe"], - ":windows_msvc" : ["bin/java.exe"], "//conditions:default" : ["bin/java"], }), data = [":jdk"], @@ -40,8 +38,6 @@ filegroup( name = "jar", srcs = select({ ":windows" : ["bin/jar.exe"], - ":windows_msys" : ["bin/jar.exe"], - ":windows_msvc" : ["bin/jar.exe"], "//conditions:default" : ["bin/jar"], }), data = [":jdk"], @@ -51,8 +47,6 @@ filegroup( name = "javac", srcs = select({ ":windows" : ["bin/javac.exe"], - ":windows_msys" : ["bin/javac.exe"], - ":windows_msvc" : ["bin/javac.exe"], "//conditions:default" : ["bin/javac"], }), data = [":jdk"], @@ -101,8 +95,6 @@ filegroup( # common antivirus software blocks access to npjp2.dll interfering with Bazel, # so do not include it in JRE on Windows. ":windows" : glob(["jre/bin/**"], exclude = ["jre/bin/plugin2/**"]), - ":windows_msys" : glob(["jre/bin/**"], exclude = ["jre/bin/plugin2/**"]), - ":windows_msvc" : glob(["jre/bin/**"], exclude = ["jre/bin/plugin2/**"]), "//conditions:default" : glob(["jre/bin/**"]) }), ) @@ -182,14 +174,3 @@ config_setting( visibility = ["//visibility:private"], ) -config_setting( - name = "windows_msys", - values = {"cpu": "x64_windows_msys"}, - visibility = ["//visibility:private"], -) - -config_setting( - name = "windows_msvc", - values = {"cpu": "x64_windows_msvc"}, - visibility = ["//visibility:private"], -) |