Changeset af2254ec in mainline for uspace/Makefile.common

Timestamp:

2016-05-22T19:12:04Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0dc2fec, f356618

Parents:

fe036fe

Message:

Fix build with lightweight futex locks enabled.

File:

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

uspace/Makefile.common

@@ -160 +160 @@
 LIBNETTL_PREFIX = $(LIB_PREFIX)/nettl
 
-LIBURCU_PREFIX = $(LIB_PREFIX)/urcu
-
 AFLAGS = --fatal-warnings
 LFLAGS = --fatal-warnings
@@ -185 +183 @@
 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
@@ -198 +190 @@
 
 ifeq ($(STATIC_BUILD),y)
-        BASE_LIBS = $(LIBC_PREFIX)/libc.a $(LIBURCU_PREFIX)/liburcu.a $(LIBSOFTINT_PREFIX)/libsoftint.a
+        BASE_LIBS = $(LIBC_PREFIX)/libc.a $(LIBSOFTINT_PREFIX)/libsoftint.a
         LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
         ifeq ($(MATH),y)
@@ -301 +293 @@
 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)