[Lldb-commits] [PATCH] Fix global makefiles for the tests to support android

[Tamas Berghammer]

Fix broken check for OS


http://reviews.llvm.org/D7856

Files:
  test/make/Makefile.rules

Index: test/make/Makefile.rules
===================================================================
--- test/make/Makefile.rules
+++ 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))

EMAIL PREFERENCES
  http://reviews.llvm.org/settings/panel/emailpreferences/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D7856.20593.patch
Type: text/x-patch
Size: 1086 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20150224/119fda9e/attachment.bin>