diff --git a/lldb/test/functionalities/expr-doesnt-deadlock/Makefile b/lldb/test/functionalities/expr-doesnt-deadlock/Makefile
index 2b9484e80e7f..dbc04b0de8dd 100644
--- a/lldb/test/functionalities/expr-doesnt-deadlock/Makefile
+++ b/lldb/test/functionalities/expr-doesnt-deadlock/Makefile
@@ -1,5 +1,6 @@
 LEVEL = ../../make
 
+CFLAGS_EXTRAS := -lpthread
 C_SOURCES := locking.c
 
 include $(LEVEL)/Makefile.rules
diff --git a/lldb/test/functionalities/stop-hook/multiple_threads/Makefile b/lldb/test/functionalities/stop-hook/multiple_threads/Makefile
index 314f1cb2f077..ecf078b3a161 100644
--- a/lldb/test/functionalities/stop-hook/multiple_threads/Makefile
+++ b/lldb/test/functionalities/stop-hook/multiple_threads/Makefile
@@ -1,5 +1,6 @@
 LEVEL = ../../../make
 
+LDFLAGS := -lpthread
 CXX_SOURCES := main.cpp
 
 include $(LEVEL)/Makefile.rules
diff --git a/lldb/test/functionalities/watchpoint/hello_watchlocation/Makefile b/lldb/test/functionalities/watchpoint/hello_watchlocation/Makefile
index 314f1cb2f077..ecf078b3a161 100644
--- a/lldb/test/functionalities/watchpoint/hello_watchlocation/Makefile
+++ b/lldb/test/functionalities/watchpoint/hello_watchlocation/Makefile
@@ -1,5 +1,6 @@
 LEVEL = ../../../make
 
+LDFLAGS := -lpthread
 CXX_SOURCES := main.cpp
 
 include $(LEVEL)/Makefile.rules
diff --git a/lldb/test/functionalities/watchpoint/multiple_threads/Makefile b/lldb/test/functionalities/watchpoint/multiple_threads/Makefile
index 314f1cb2f077..ecf078b3a161 100644
--- a/lldb/test/functionalities/watchpoint/multiple_threads/Makefile
+++ b/lldb/test/functionalities/watchpoint/multiple_threads/Makefile
@@ -1,5 +1,6 @@
 LEVEL = ../../../make
 
+LDFLAGS := -lpthread
 CXX_SOURCES := main.cpp
 
 include $(LEVEL)/Makefile.rules
diff --git a/lldb/test/functionalities/watchpoint/watchpoint_set_command/Makefile b/lldb/test/functionalities/watchpoint/watchpoint_set_command/Makefile
index 314f1cb2f077..ecf078b3a161 100644
--- a/lldb/test/functionalities/watchpoint/watchpoint_set_command/Makefile
+++ b/lldb/test/functionalities/watchpoint/watchpoint_set_command/Makefile
@@ -1,5 +1,6 @@
 LEVEL = ../../../make
 
+LDFLAGS := -lpthread
 CXX_SOURCES := main.cpp
 
 include $(LEVEL)/Makefile.rules
diff --git a/lldb/test/lang/c/blocks/Makefile b/lldb/test/lang/c/blocks/Makefile
index b09a579159d4..752b7aed3970 100644
--- a/lldb/test/lang/c/blocks/Makefile
+++ b/lldb/test/lang/c/blocks/Makefile
@@ -1,5 +1,6 @@
 LEVEL = ../../../make
 
 C_SOURCES := main.c
+CFLAGS_EXTRAS += -fblocks
 
 include $(LEVEL)/Makefile.rules
diff --git a/lldb/test/lang/c/shared_lib/Makefile b/lldb/test/lang/c/shared_lib/Makefile
index 9d9972acd57b..bf003c39e586 100644
--- a/lldb/test/lang/c/shared_lib/Makefile
+++ b/lldb/test/lang/c/shared_lib/Makefile
@@ -3,5 +3,6 @@ LEVEL = ../../../make
 DYLIB_NAME := libfoo
 DYLIB_C_SOURCES := foo.c
 C_SOURCES := main.c
+CFLAGS_EXTRAS += -fPIC
 
 include $(LEVEL)/Makefile.rules
diff --git a/lldb/test/python_api/lldbutil/iter/Makefile b/lldb/test/python_api/lldbutil/iter/Makefile
index 312d3fec3e1c..865b34ba4598 100644
--- a/lldb/test/python_api/lldbutil/iter/Makefile
+++ b/lldb/test/python_api/lldbutil/iter/Makefile
@@ -1,5 +1,7 @@
 LEVEL = ../../../make
 
+CFLAGS_EXTRAS := -D__STDC_LIMIT_MACROS
+LDFLAGS := -lpthread
 CXX_SOURCES := main.cpp
 MAKE_DSYM :=NO
 
diff --git a/lldb/test/python_api/lldbutil/process/Makefile b/lldb/test/python_api/lldbutil/process/Makefile
index 312d3fec3e1c..865b34ba4598 100644
--- a/lldb/test/python_api/lldbutil/process/Makefile
+++ b/lldb/test/python_api/lldbutil/process/Makefile
@@ -1,5 +1,7 @@
 LEVEL = ../../../make
 
+CFLAGS_EXTRAS := -D__STDC_LIMIT_MACROS
+LDFLAGS := -lpthread
 CXX_SOURCES := main.cpp
 MAKE_DSYM :=NO
 
diff --git a/lldb/test/python_api/module_section/Makefile b/lldb/test/python_api/module_section/Makefile
index 5738d5684daf..2e9a4de9de99 100644
--- a/lldb/test/python_api/module_section/Makefile
+++ b/lldb/test/python_api/module_section/Makefile
@@ -1,5 +1,7 @@
 LEVEL = ../../make
 
+CFLAGS_EXTRAS := -D__STDC_LIMIT_MACROS
+LDFLAGS := -lpthread
 CXX_SOURCES := main.cpp b.cpp c.cpp
 MAKE_DSYM :=NO
 
diff --git a/lldb/test/python_api/watchpoint/watchlocation/Makefile b/lldb/test/python_api/watchpoint/watchlocation/Makefile
index 314f1cb2f077..ecf078b3a161 100644
--- a/lldb/test/python_api/watchpoint/watchlocation/Makefile
+++ b/lldb/test/python_api/watchpoint/watchlocation/Makefile
@@ -1,5 +1,6 @@
 LEVEL = ../../../make
 
+LDFLAGS := -lpthread
 CXX_SOURCES := main.cpp
 
 include $(LEVEL)/Makefile.rules