From 5417654582642359a597b273bacaaedcc99f758f Mon Sep 17 00:00:00 2001 From: alyssawilk Date: Thu, 3 Nov 2022 12:59:22 -0400 Subject: [PATCH] build: fix cross-platform android builds on OS X (#237) Fixes https://github.com/abseil/abseil-cpp/issues/326. --- BUILD | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/BUILD b/BUILD index cd0ca3e..6e1fc91 100644 --- a/BUILD +++ b/BUILD @@ -14,20 +14,6 @@ licenses(["notice"]) -config_setting( - name = "osx", - constraint_values = [ - "@platforms//os:osx", - ], -) - -config_setting( - name = "ios", - constraint_values = [ - "@platforms//os:ios", - ], -) - ### libraries cc_library( @@ -66,15 +52,10 @@ cc_library( "include/cctz/zone_info_source.h", ], includes = ["include"], - 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"], )