diff options
| author |  Laszlo Csomor <laszlocsomor@google.com> | 2017-03-09 08:11:19 +0000 |
|---|---|---|
| committer |  Vladimir Moskva <vladmos@google.com> | 2017-03-09 10:30:32 +0000 |
| commit | 561e4498139da2742314a85930011cb4db4d7879 (patch) | |
| tree | 43c1a6323c76b2b60e9c1e3976b9be7dfb98617c /src/tools/singlejar | |
| parent | 7a5a236dfd099eb78e019482e9fc428b5b1182fd (diff) | |
Singlejar: Windows-aware jar tool path
See https://github.com/bazelbuild/bazel/issues/2107
--
PiperOrigin-RevId: 149626394
MOS_MIGRATED_REVID=149626394
Diffstat (limited to 'src/tools/singlejar')
| -rw-r--r-- | src/tools/singlejar/BUILD | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/tools/singlejar/BUILD b/src/tools/singlejar/BUILD index 588efefb47..f94086ea62 100644 --- a/src/tools/singlejar/BUILD +++ b/src/tools/singlejar/BUILD @@ -2,6 +2,15 @@ # singlejar C++ implementation. package(default_visibility = ["//src:__subpackages__"]) +JAR_TOOL_PATH_COPT_TPL = "-DJAR_TOOL_PATH=\\\"external/local_jdk/bin/jar%s\\\"" + +JAR_TOOL_PATH_COPTS = select({ + "//src:windows": [JAR_TOOL_PATH_COPT_TPL % ".exe"], + "//src:windows_msvc": [JAR_TOOL_PATH_COPT_TPL % ".exe"], + "//src:windows_msys": [JAR_TOOL_PATH_COPT_TPL % ".exe"], + "//conditions:default": [JAR_TOOL_PATH_COPT_TPL % ""], +}) + filegroup( name = "srcs", srcs = glob(["**"]), @@ -76,7 +85,7 @@ cc_test( "input_jar_scan_entries_test.h", "input_jar_scan_jartool_test.cc", ], - copts = ["-DJAR_TOOL_PATH=\\\"external/local_jdk/bin/jar\\\""], + copts = JAR_TOOL_PATH_COPTS, data = [ "@local_jdk//:jar", "@local_jdk//:jdk", @@ -151,7 +160,7 @@ cc_test( srcs = [ "output_jar_simple_test.cc", ], - copts = ["-DJAR_TOOL_PATH=\\\"external/local_jdk/bin/jar\\\""], + copts = JAR_TOOL_PATH_COPTS, data = [ ":data1", ":data2", |