From 4a98f786820f72ff7483c46d14fe85f3310f1272 Mon Sep 17 00:00:00 2001 From: Derek Mauro Date: Thu, 3 Nov 2022 11:09:12 -0700 Subject: Import of CCTZ from GitHub. PiperOrigin-RevId: 485921596 Change-Id: I453801e3d7b4a60ecedf173d448c8b6f51cb0b2e --- absl/time/internal/cctz/BUILD.bazel | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/absl/time/internal/cctz/BUILD.bazel b/absl/time/internal/cctz/BUILD.bazel index 7304d40d..047e889a 100644 --- a/absl/time/internal/cctz/BUILD.bazel +++ b/absl/time/internal/cctz/BUILD.bazel @@ -21,20 +21,6 @@ filegroup( srcs = glob(["testdata/zoneinfo/**"]), ) -config_setting( - name = "osx", - constraint_values = [ - "@platforms//os:osx", - ], -) - -config_setting( - name = "ios", - constraint_values = [ - "@platforms//os:ios", - ], -) - ### libraries cc_library( @@ -72,15 +58,10 @@ cc_library( "include/cctz/time_zone.h", "include/cctz/zone_info_source.h", ], - linkopts = select({ - ":osx": [ - "-framework Foundation", - ], - ":ios": [ - "-framework Foundation", - ], - "//conditions:default": [], - }), + # OS X and iOS no longer use `linkopts = ["-framework CoreFoundation"]` + # as (1) bazel adds it automatically, and (2) it caused problems when + # cross-compiling for Android. + # See https://github.com/abseil/abseil-cpp/issues/326 for details. visibility = ["//visibility:public"], deps = [ ":civil_time", -- cgit v1.2.3