Index: uspace/Makefile.common
===================================================================
--- uspace/Makefile.common	(revision 3d7594d42c938e19964b3a0d610687423c67673b)
+++ uspace/Makefile.common	(revision 9c4df2136d978f44d78151ee519a3de3c8e56567)
@@ -120,6 +120,14 @@
 		STATIC_BUILD = y
 	else
-		ifeq ($(CONFIG_USE_SHARED_LIBS),y)
-			STATIC_BUILD = n
+		ifeq ($(CONFIG_BUILD_SHARED_LIBS),y)
+			ifeq ($(CONFIG_USE_SHARED_LIBS),y)
+				STATIC_BUILD = n
+			else
+				ifeq ($(LIBRARY),)
+					STATIC_BUILD = y
+				else
+					STATIC_BUILD = n
+				endif
+			endif
 		else
 			STATIC_BUILD = y