Index: uspace/Makefile.common
===================================================================
--- uspace/Makefile.common	(revision 53e3950b8dbd2e01cd0a036711fe2760544ae3bf)
+++ uspace/Makefile.common	(revision 9e534065df86b5f49dd2c8a5029bd6cc3f6b3a7d)
@@ -181,4 +181,16 @@
 endif
 
+# Build static because liburcu is linked against libc which uses thread
+# local variables
+ifneq ($(findstring urcu, $(LIBS)),)
+	STATIC_BUILD = y
+endif
+
+# Build static because libpcut is linked against libc which uses thread
+# local variables
+ifneq ($(TEST_SOURCES),)
+	STATIC_BUILD = y
+endif
+
 ifeq ($(STATIC_BUILD),y)
 	BASE_LIBS = $(LIBC_PREFIX)/libc.a $(LIBSOFTINT_PREFIX)/libsoftint.a