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
This commit is contained in:
parent
36910d3d7e
commit
9a41ffdd3a
3 changed files with 4 additions and 15 deletions
11
WORKSPACE
11
WORKSPACE
|
@ -1,17 +1,6 @@
|
||||||
workspace(name = "com_google_absl")
|
workspace(name = "com_google_absl")
|
||||||
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
|
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
|
||||||
|
|
||||||
# Bazel toolchains
|
|
||||||
http_archive(
|
|
||||||
name = "bazel_toolchains",
|
|
||||||
urls = [
|
|
||||||
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/bc09b995c137df042bb80a395b73d7ce6f26afbe.tar.gz",
|
|
||||||
"https://github.com/bazelbuild/bazel-toolchains/archive/bc09b995c137df042bb80a395b73d7ce6f26afbe.tar.gz",
|
|
||||||
],
|
|
||||||
strip_prefix = "bazel-toolchains-bc09b995c137df042bb80a395b73d7ce6f26afbe",
|
|
||||||
sha256 = "4329663fe6c523425ad4d3c989a8ac026b04e1acedeceb56aa4b190fa7f3973c",
|
|
||||||
)
|
|
||||||
|
|
||||||
# GoogleTest/GoogleMock framework. Used by most unit-tests.
|
# GoogleTest/GoogleMock framework. Used by most unit-tests.
|
||||||
http_archive(
|
http_archive(
|
||||||
name = "com_google_googletest",
|
name = "com_google_googletest",
|
||||||
|
|
|
@ -57,8 +57,8 @@ using ThrowAllocMovableThrowerVec =
|
||||||
\
|
\
|
||||||
: std::initializer_list<T>{T(0, testing::nothrow_ctor), \
|
: std::initializer_list<T>{T(0, testing::nothrow_ctor), \
|
||||||
T(1, testing::nothrow_ctor)})
|
T(1, testing::nothrow_ctor)})
|
||||||
static_assert((kLargeSize == 8 || kSmallSize == 2),
|
static_assert(kLargeSize == 8, "Must update ABSL_INTERNAL_MAKE_INIT_LIST(...)");
|
||||||
"Must update ABSL_INTERNAL_MAKE_INIT_LIST(...).");
|
static_assert(kSmallSize == 2, "Must update ABSL_INTERNAL_MAKE_INIT_LIST(...)");
|
||||||
|
|
||||||
template <typename TheVecT, size_t... TheSizes>
|
template <typename TheVecT, size_t... TheSizes>
|
||||||
class TestParams {
|
class TestParams {
|
||||||
|
|
|
@ -79,10 +79,10 @@ cc_library(
|
||||||
"include/cctz/zone_info_source.h",
|
"include/cctz/zone_info_source.h",
|
||||||
],
|
],
|
||||||
linkopts = select({
|
linkopts = select({
|
||||||
":ios": [
|
":osx": [
|
||||||
"-framework Foundation",
|
"-framework Foundation",
|
||||||
],
|
],
|
||||||
":osx": [
|
":ios": [
|
||||||
"-framework Foundation",
|
"-framework Foundation",
|
||||||
],
|
],
|
||||||
"//conditions:default": [],
|
"//conditions:default": [],
|
||||||
|
|
Loading…
Reference in a new issue