diff options
author | Josh Haberman <jhaberman@gmail.com> | 2016-04-07 14:10:19 -0700 |
---|---|---|
committer | Josh Haberman <jhaberman@gmail.com> | 2016-04-07 14:10:19 -0700 |
commit | 4465daa57a4b6910965e9d078ae125ddb9ee8c21 (patch) | |
tree | e6d5096e6a2a5523d2b1975f6248cd9d8f8957ce /BUILD | |
parent | 15239361e31d53c10b918aa9fe8ce057155588b4 (diff) | |
parent | 09292d5759cbf3e82dcfae67e01ee31ed8906b5a (diff) | |
download | protobuf-4465daa57a4b6910965e9d078ae125ddb9ee8c21.tar.gz protobuf-4465daa57a4b6910965e9d078ae125ddb9ee8c21.tar.bz2 protobuf-4465daa57a4b6910965e9d078ae125ddb9ee8c21.zip |
Merge branch 'master' into internal-merge
Diffstat (limited to 'BUILD')
-rw-r--r-- | BUILD | 14 |
1 files changed, 12 insertions, 2 deletions
@@ -15,8 +15,18 @@ COPTS = [ "-Wno-error=unused-function", ] -# Bazel should provide portable link_opts for pthread. -LINK_OPTS = ["-lpthread"] +config_setting( + name = "android", + values = { + "crosstool_top": "//external:android/crosstool", + }, +) + +# Android builds do not need to link in a separate pthread library. +LINK_OPTS = select({ + ":android": [], + "//conditions:default": ["-lpthread"], +}) load( "protobuf", |