aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Cozzette <acozzette@gmail.com>2018-05-16 13:19:25 -0700
committerGitHub <noreply@github.com>2018-05-16 13:19:25 -0700
commitee1c0eb34e9509d800b41896446fdd731de0d5c5 (patch)
tree98638e0df13d91a61880645932c1ba92ddf4f40b
parente232038e061ad99225a1c568fca24181416461ef (diff)
parentc92b4e11d3638bd5bccfe3804d35e7a86d36cb57 (diff)
downloadprotobuf-ee1c0eb34e9509d800b41896446fdd731de0d5c5.tar.gz
protobuf-ee1c0eb34e9509d800b41896446fdd731de0d5c5.tar.bz2
protobuf-ee1c0eb34e9509d800b41896446fdd731de0d5c5.zip
Merge pull request #4631 from banshee/fix_4615
Fix 4615
-rw-r--r--configure.ac2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 6e9ce1f5..7a5e3ab2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -190,7 +190,7 @@ AM_CONDITIONAL([HAVE_PTHREAD], [test "x$ax_pthread_ok" = "xyes"])
AC_CXX_STL_HASH
case "$target_os" in
- mingw* | cygwin* | win* | aix*)
+ mingw* | cygwin* | win* | aix* | *android* )
;;
*)
# Need to link against rt on Solaris