diff options
| author | Jisi Liu <liujisi@google.com> | 2017-10-20 11:56:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-20 11:56:31 -0700 |
| commit | cefa9d73e3ce62b080fda0b306bbeb67a6fc2efa (patch) | |
| tree | 0922bac6ea35e251349c6e620a492d4e81c5562b | |
| parent | ca6187d5e76fee30d29d07a2c620421b90244bdd (diff) | |
| parent | 3130ce03fd0439e17d30b98833568a0eb9bc1a2b (diff) | |
| download | protobuf-cefa9d73e3ce62b080fda0b306bbeb67a6fc2efa.tar.gz protobuf-cefa9d73e3ce62b080fda0b306bbeb67a6fc2efa.tar.bz2 protobuf-cefa9d73e3ce62b080fda0b306bbeb67a6fc2efa.zip | |
Merge pull request #3758 from spinorx/3.4.x
[v3.4.x branch] Fix iOS cc_library build for protobuf.
| -rw-r--r-- | BUILD | 45 |
1 files changed, 2 insertions, 43 deletions
@@ -59,37 +59,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 = [ @@ -121,12 +90,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"], @@ -193,12 +157,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"], |