summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Austad <henrik@austad.us>2015-10-21 21:00:10 +0200
committerJohn Kacur <jkacur@redhat.com>2015-10-22 10:38:55 +0200
commitb0a075980bc1495a443f5e11f6d49dcde282ae10 (patch)
tree9153eb3eb74f6674e9c698243ba7e0cd7f49009b
parentebe16ac45175b6b1e123cfafd128276ed15d0d8a (diff)
downloadrt-tests-b0a075980bc1495a443f5e11f6d49dcde282ae10.tar.gz
Android: Expand match for android in ostype
Some buildsystems use androidabe, so an exact match will break in those circumstances. Cc: John Kacur <jkacur@redhat.com> Signed-off-by: Henrik Austad <haustad@cisco.com> Signed-off-by: John Kacur <jkacur@redhat.com>
-rw-r--r--src/arch/android/Makefile14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/arch/android/Makefile b/src/arch/android/Makefile
index e25f672..2c4b4b7 100644
--- a/src/arch/android/Makefile
+++ b/src/arch/android/Makefile
@@ -1,10 +1,14 @@
-# Bionic (android) does not have:
+# Android use Bionic for libc, and this does not have
# - pthread barriers
# - pthread_[gs]etaffinity
#
-# Typically see something like "aarch64-linux-android"
-ifeq (android,$(ostype))
+# This is all handled by bionic.h based on flags we set here.
+
+# Typically see something like "aarch64-linux-android". However, in some
+# buildsystems, it will be a variation of -androidabe.
+ost=$(findstring android, $(ostype))
+ifeq (android,$(ost))
USE_BIONIC := 1
CFLAGS += -DPTHREAD_BIONIC
@@ -13,9 +17,7 @@ ifeq (android,$(ostype))
LIBS := $(filter-out -lrt,$(LIBS))
LIBS := $(filter-out -lpthread,$(LIBS))
-# BIONIC does not support PI, barriers and has different files in
-# include/. This means that currently, only these binaries will compile
-# and link properly:
+# Currently, only these binaries will compile and link properly for android
# - cyclictest
# - hackbench
sources := cyclictest.c hackbench.c