diff options
| author |  Jisi Liu <liujisi@google.com> | 2017-10-20 11:56:13 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-10-20 11:56:13 -0700 |
| commit | b189389e2f2ca01dd534a8e9ba3ac38ea45cdba6 (patch) | |
| tree | 71febf9849f1009b88e1be6fffc3bb0ba8b11b94 /BUILD | |
| parent | 09e0dbcf8f8a078070921e18b0592dbe7f9628df (diff) | |
| parent | 16792c624003a33f350cac8f8d72731335d07fb9 (diff) | |
Merge pull request #3757 from spinorx/master
Fix iOS cc_library build for protobuf.
Diffstat (limited to 'BUILD')
| -rw-r--r-- | BUILD | 45 |
1 files changed, 2 insertions, 43 deletions
@@ -61,37 +61,6 @@ load( "internal_protobuf_py_tests", ) -config_setting( - name = "ios_armv7", - values = { - "ios_cpu": "armv7", - }, -) - -config_setting( - name = "ios_armv7s", - values = { - "ios_cpu": "armv7s", - }, -) - -config_setting( - name = "ios_arm64", - values = { - "ios_cpu": "arm64", - }, -) - -IOS_ARM_COPTS = [ - "-DOS_IOS", - "-miphoneos-version-min=7.0", - "-arch armv7", - "-arch armv7s", - "-arch arm64", - "-D__thread=", - "-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.2.sdk/", -] - cc_library( name = "protobuf_lite", srcs = [ @@ -123,12 +92,7 @@ cc_library( "src/google/protobuf/wire_format_lite.cc", ], hdrs = glob(["src/google/protobuf/**/*.h"]), - copts = select({ - ":ios_armv7": IOS_ARM_COPTS, - ":ios_armv7s": IOS_ARM_COPTS, - ":ios_arm64": IOS_ARM_COPTS, - "//conditions:default": [], - }) + COPTS, + copts = COPTS, includes = ["src/"], linkopts = LINK_OPTS, visibility = ["//visibility:public"], @@ -195,12 +159,7 @@ cc_library( "src/google/protobuf/wrappers.pb.cc", ], hdrs = glob(["src/**/*.h"]), - copts = select({ - ":ios_armv7": IOS_ARM_COPTS, - ":ios_armv7s": IOS_ARM_COPTS, - ":ios_arm64": IOS_ARM_COPTS, - "//conditions:default": [], - }) + COPTS, + copts = COPTS, includes = ["src/"], linkopts = LINK_OPTS, visibility = ["//visibility:public"], |