about summary refs log tree commit diff
path: root/absl/time/internal
diff options
context:
space:
mode:
authorAbseil Team <absl-team@google.com>2019-08-16T14·40-0700
committerDerek Mauro <dmauro@google.com>2019-08-16T14·44-0400
commit9a41ffdd3a0ccbcdd29c4e3886b28e06f2cd9c66 (patch)
treec257a263bc2494e0e2ea0789c0976bd130648d76 /absl/time/internal
parent36910d3d7e9fccadd6603f232d0c4f54dcd47c7e (diff)
Export of internal Abseil changes
--
1d8539bec6f0b390360b896d4c43da5b546486e1 by Derek Mauro <dmauro@google.com>:

Load C++ BUILD rules from the @rules_cc repository.
Required for Bazel 1.0.

Internal import of GitHub Pull Request #351

PiperOrigin-RevId: 263768433

--
017d315f1b5d4b4f2e1d6615265134f1001f2b84 by Derek Mauro <dmauro@google.com>:

Import of CCTZ from GitHub.

PiperOrigin-RevId: 263762409

--
77b3cdeca653df595d4709db74230f38b35c9c7c by CJ Johnson <johnsoncj@google.com>:

Fixes logical error in test file's static_assert

PiperOrigin-RevId: 263610500

--
cd358e4efc21c8c2ef79cb137d75c829aeee4417 by Derek Mauro <dmauro@google.com>:

Remove bazel_toolchains from WORKSPACE.bazel

The Abseil build doesn't use it anymore.

PiperOrigin-RevId: 263609624
GitOrigin-RevId: 1d8539bec6f0b390360b896d4c43da5b546486e1
Change-Id: I17a5ddfe7409aa110b945aeda4de14bc217907ad
Diffstat (limited to 'absl/time/internal')
-rw-r--r--absl/time/internal/cctz/BUILD.bazel4
1 files changed, 2 insertions, 2 deletions
diff --git a/absl/time/internal/cctz/BUILD.bazel b/absl/time/internal/cctz/BUILD.bazel
index c7cb6b9d2546..9585abd7680e 100644
--- a/absl/time/internal/cctz/BUILD.bazel
+++ b/absl/time/internal/cctz/BUILD.bazel
@@ -79,10 +79,10 @@ cc_library(
         "include/cctz/zone_info_source.h",
     ],
     linkopts = select({
-        ":ios": [
+        ":osx": [
             "-framework Foundation",
         ],
-        ":osx": [
+        ":ios": [
             "-framework Foundation",
         ],
         "//conditions:default": [],