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

File:

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

uspace/Makefile.common

@@ -160 +160 @@
 LIBNETTL_PREFIX = $(LIB_PREFIX)/nettl
 
+LIBURCU_PREFIX = $(LIB_PREFIX)/urcu
+
 AFLAGS = --fatal-warnings
 LFLAGS = --fatal-warnings
@@ -183 +185 @@
 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
@@ -191 +199 @@
 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
@@ -197 +204 @@
 else
         BASE_LIBS = $(LIBC_PREFIX)/libc.so.0 $(LIBSOFTINT_PREFIX)/libsoftint.so.0
-        LFLAGS += -Bdynamic
-        LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld
+        LINK_DYNAMIC = y
         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
 
@@ -293 +306 @@
 JOBFILE = $(LIBC_PREFIX)/../../../tools/jobfile.py
 
+ifeq ($(FUTEX_UPGRADABLE),y)
+        CFLAGS += -I$(LIBURCU_PREFIX)/
+        LIBS += $(LIBURCU_PREFIX)/liburcu.a
+endif
+
 ifeq ($(COMPILER),gcc_cross)
         CFLAGS += $(GCC_CFLAGS)
@@ -318 +336 @@
 endif
 
-
-ifneq ($(MAKECMDGOALS),clean)
 -include $(DEPEND)
-endif
 
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
@@ -361 +376 @@
 
 ifneq ($(LIBRARY),)
-$(LIBRARY).a: $(OBJECTS)
+%.a: $(OBJECTS)
         $(AR) rc $@ $(OBJECTS)
 endif
 
-ifneq ($(LARCHIVE),)
-$(LARCHIVE): $(LOBJECTS)
+ifneq ($(SLIBRARY),)
+%.la: $(LOBJECTS)
         $(AR) rc $@ $(LOBJECTS)
 endif