diff options
author | Yun Peng <pcloudy@google.com> | 2017-03-08 14:30:49 +0000 |
---|---|---|
committer | Vladimir Moskva <vladmos@google.com> | 2017-03-08 15:07:05 +0000 |
commit | cb8a5e25382cb67a80449ac1fb78ae9680650b92 (patch) | |
tree | 2e60ba611839365626caa8bd286d49cac0c35b7b /src/test/java/com | |
parent | c77eac95ffdee4f127e20266c41cb92cec2a8956 (diff) |
Make Bazel build with MSVC-default-toolchain Bazel
After this change, a msys bazel can be built with
a MSVC-default Bazel by adding --cpu=x64_windows_msys --host=x64_windows_msys
See https://github.com/bazelbuild/bazel/issues/2627
--
Change-Id: Iaa82bf4dd911c5740b98d3b2739dfccca6203f79
Reviewed-on: https://cr.bazel.build/9293
PiperOrigin-RevId: 149532274
MOS_MIGRATED_REVID=149532274
Diffstat (limited to 'src/test/java/com')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/BUILD | 1 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/repository/BUILD | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD index b1bbf23d64..2aa95f5a91 100644 --- a/src/test/java/com/google/devtools/build/lib/BUILD +++ b/src/test/java/com/google/devtools/build/lib/BUILD @@ -23,6 +23,7 @@ ALL_WINDOWS_TESTS = CROSS_PLATFORM_WINDOWS_TESTS + WINDOWS_ON_WINDOWS_TESTS JNI_LIB = select({ "//src:windows": ["//src/main/native:windows_jni.dll"], + "//src:windows_msys": ["//src/main/native:windows_jni.dll"], "//src:windows_msvc": ["//src/main/native:windows_jni.dll"], "//conditions:default": [ "//src/main/native:libunix.dylib", diff --git a/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD b/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD index 2b281f0b50..ed24a5081f 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD +++ b/src/test/java/com/google/devtools/build/lib/rules/repository/BUILD @@ -8,6 +8,7 @@ java_test( name = "RepositoryTests", srcs = select({ "//src:windows": [":RepositoryTests_windows_srcs"], + "//src:windows_msys": [":RepositoryTests_windows_srcs"], "//src:windows_msvc": [":RepositoryTests_windows_srcs"], "//conditions:default": glob(["*.java"]), }), |