Index: lldb/trunk/test/make/Makefile.rules =================================================================== --- lldb/trunk/test/make/Makefile.rules +++ lldb/trunk/test/make/Makefile.rules @@ -123,10 +123,10 @@ LD = $(CC) LDFLAGS ?= $(CFLAGS) LDFLAGS += $(LD_EXTRAS) -ifneq "$(OS)" "Windows_NT" +ifeq (,$(filter $(OS), Windows_NT Android)) ifeq "$(ENABLE_THREADS)" "YES" LDFLAGS += -lpthread - else + else ifeq "$(ENABLE_STD_THREADS)" "YES" # with the specific combination of Linux, g++, std=c++11, adding the # linker flag -lpthread, will cause a program to hang when a std::conditional_variable @@ -193,6 +193,13 @@ endif #---------------------------------------------------------------------- +# Android specific options +#---------------------------------------------------------------------- +ifeq "$(OS)" "Android" + LDFLAGS += -pie +endif + +#---------------------------------------------------------------------- # C++ standard library options #---------------------------------------------------------------------- ifeq (1,$(USE_LIBSTDCPP))