From 9a41ffdd3a0ccbcdd29c4e3886b28e06f2cd9c66 Mon Sep 17 00:00:00 2001
From: Abseil Team <absl-team@google.com>
Date: Fri, 16 Aug 2019 07:40:46 -0700
Subject: 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
---
 absl/container/inlined_vector_exception_safety_test.cc | 4 ++--
 absl/time/internal/cctz/BUILD.bazel                    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'absl')

diff --git a/absl/container/inlined_vector_exception_safety_test.cc b/absl/container/inlined_vector_exception_safety_test.cc
index ff0da75b7ba7..b4fff3250561 100644
--- a/absl/container/inlined_vector_exception_safety_test.cc
+++ b/absl/container/inlined_vector_exception_safety_test.cc
@@ -57,8 +57,8 @@ using ThrowAllocMovableThrowerVec =
                                                                \
        : std::initializer_list<T>{T(0, testing::nothrow_ctor), \
                                   T(1, testing::nothrow_ctor)})
-static_assert((kLargeSize == 8 || kSmallSize == 2),
-              "Must update ABSL_INTERNAL_MAKE_INIT_LIST(...).");
+static_assert(kLargeSize == 8, "Must update ABSL_INTERNAL_MAKE_INIT_LIST(...)");
+static_assert(kSmallSize == 2, "Must update ABSL_INTERNAL_MAKE_INIT_LIST(...)");
 
 template <typename TheVecT, size_t... TheSizes>
 class TestParams {
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": [],
-- 
cgit 1.4.1