aboutsummaryrefslogtreecommitdiffhomepage
path: root/third_party/jpeg
diff options
context:
space:
mode:
authorGravatar Austin Anderson <angerson@google.com>2017-12-05 17:36:42 -0800
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2017-12-05 17:40:58 -0800
commitd9a71ad0e5723e6e97741d60be106a6658cde4e4 (patch)
treebb66a5455655f43c384521a15a6de4eb43b8166a /third_party/jpeg
parentfb857dcef928700b9d75c80b533299957a1581fb (diff)
Fix some build incompatibilities with new versions of Bazel
See #15137. PiperOrigin-RevId: 178037461
Diffstat (limited to 'third_party/jpeg')
-rw-r--r--third_party/jpeg/jpeg.BUILD8
1 files changed, 6 insertions, 2 deletions
diff --git a/third_party/jpeg/jpeg.BUILD b/third_party/jpeg/jpeg.BUILD
index e431f19382..527a08c4b3 100644
--- a/third_party/jpeg/jpeg.BUILD
+++ b/third_party/jpeg/jpeg.BUILD
@@ -323,14 +323,18 @@ JCONFIG_NOWIN_COMMON_SUBSTITUTIONS = {
"#undef RIGHT_SHIFT_IS_UNSIGNED": "",
}
-JCONFIG_NOWIN_SIMD_SUBSTITUTIONS = JCONFIG_NOWIN_COMMON_SUBSTITUTIONS + {
+JCONFIG_NOWIN_SIMD_SUBSTITUTIONS = {
"#undef WITH_SIMD": "#define WITH_SIMD 1",
}
-JCONFIG_NOWIN_NOSIMD_SUBSTITUTIONS = JCONFIG_NOWIN_COMMON_SUBSTITUTIONS + {
+JCONFIG_NOWIN_NOSIMD_SUBSTITUTIONS = {
"#undef WITH_SIMD": "",
}
+JCONFIG_NOWIN_SIMD_SUBSTITUTIONS.update(JCONFIG_NOWIN_COMMON_SUBSTITUTIONS)
+
+JCONFIG_NOWIN_NOSIMD_SUBSTITUTIONS.update(JCONFIG_NOWIN_COMMON_SUBSTITUTIONS)
+
template_rule(
name = "jconfig_nowin_nosimd",
src = "jconfig.h.in",