Changes in uspace/Makefile.common [2d2b8e6:79ae36dd] in mainline

File:

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

uspace/Makefile.common

@@ -44 +44 @@
 #   EXTRA_CLEAN        additional cleanup targets
 #
-#   POSIX_COMPAT       set to 'y' to use POSIX compatibility layer
-#
 # Optionally, for a binary:
 #   STATIC_NEEDED      set to 'y' for init binaries, will build statically
@@ -106 +104 @@
 LIBSOFTINT_PREFIX = $(LIB_PREFIX)/softint
 
-LIBPOSIX_PREFIX = $(LIB_PREFIX)/posix
-
 LIBBLOCK_PREFIX = $(LIB_PREFIX)/block
 LIBFS_PREFIX = $(LIB_PREFIX)/fs
 LIBCLUI_PREFIX = $(LIB_PREFIX)/clui
+
+LIBEXT2_PREFIX = $(LIB_PREFIX)/ext2
+
+LIBUSB_PREFIX = $(LIB_PREFIX)/usb
+LIBUSBHOST_PREFIX = $(LIB_PREFIX)/usbhost
+LIBUSBDEV_PREFIX = $(LIB_PREFIX)/usbdev
+LIBUSBHID_PREFIX = $(LIB_PREFIX)/usbhid
+LIBUSBVIRT_PREFIX = $(LIB_PREFIX)/usbvirt
 
 LIBDRV_PREFIX = $(LIB_PREFIX)/drv
@@ -130 +134 @@
 endif
 
+# Build static whenever we use libusb because that library uses 
+# thread local variables
+ifneq ($(findstring usb, $(LIBS)),)
+        STATIC_BUILD = y
+endif
+
 ifeq ($(STATIC_BUILD), y)
 BASE_LIBS = $(LIBC_PREFIX)/libc.a $(LIBSOFTINT_PREFIX)/libsoftint.a
@@ -201 +211 @@
 JOBFILE = $(LIBC_PREFIX)/../../../tools/jobfile.py
 
-ifeq ($(POSIX_COMPAT),y)
-        CFLAGS = -I$(LIBPOSIX_PREFIX)
-        LIBS += $(LIBPOSIX_PREFIX)/libposix.a
-endif
-
 ifeq ($(COMPILER),gcc_cross)
-        CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)
+        CFLAGS = $(GCC_CFLAGS) $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
 ifeq ($(COMPILER),gcc_native)
-        CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)
+        CFLAGS = $(GCC_CFLAGS) $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
 ifeq ($(COMPILER),icc)
-        CFLAGS += $(ICC_CFLAGS) $(EXTRA_CFLAGS)
+        CFLAGS = $(ICC_CFLAGS) $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
 ifeq ($(COMPILER),clang)
-        CFLAGS += $(CLANG_CFLAGS) $(EXTRA_CFLAGS)
+        CFLAGS = $(CLANG_CFLAGS) $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif