Changeset b1c57a8 in mainline for uspace/Makefile.common

Timestamp:

2014-10-09T15:03:55Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e367939c

Parents:

21799398 (diff), 207e8880 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~adam-hraska+lp/helenos/rcu/.

Only merge from the feature branch and resolve all conflicts.

File:

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

uspace/Makefile.common

@@ -156 +156 @@
 LIBGPT_PREFIX = $(LIB_PREFIX)/gpt
 
+LIBURCU_PREFIX = $(LIB_PREFIX)/urcu
+
 ifeq ($(STATIC_NEEDED),y)
         STATIC_BUILD = y
@@ -281 +283 @@
 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) $(EXTRA_CFLAGS)