Changes in uspace/Makefile.common [b272c67a:af2254ec] in mainline

File:

• uspace/Makefile.common (modified) (2 diffs)

uspace/Makefile.common

@@ -177 +177 @@
 endif
 
+# Build static whenever we use libusb because that library uses 
+# thread local variables
+ifneq ($(findstring usb, $(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
+        LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
         ifeq ($(MATH),y)
                 BASE_LIBS += $(LIBMATH_PREFIX)/libmath.a
@@ -184 +197 @@
 else
         BASE_LIBS = $(LIBC_PREFIX)/libc.so.0 $(LIBSOFTINT_PREFIX)/libsoftint.so.0
-        LINK_DYNAMIC = y
+        LFLAGS += -Bdynamic
+        LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld
         ifeq ($(MATH),y)
                 BASE_LIBS += $(LIBMATH_PREFIX)/libmath.so.0
         endif
-endif
-
-ifeq ($(LINK_DYNAMIC),y)
-        LFLAGS += -Bdynamic
-        LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld
-else
-        LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
 endif