Changeset f570cdf in mainline for uspace/Makefile.common

Timestamp:

2016-05-24T15:32:57Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c170438

Parents:

dcc150cb (diff), 0a981e3 (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 with mainline

File:

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

uspace/Makefile.common

@@ -160 +160 @@
 LIBNETTL_PREFIX = $(LIB_PREFIX)/nettl
 
-LIBURCU_PREFIX = $(LIB_PREFIX)/urcu
-
 AFLAGS = --fatal-warnings
 LFLAGS = --fatal-warnings
@@ -179 +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 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
-ifneq ($(TEST_SOURCES),)
-        STATIC_BUILD = y
-endif
-
 ifeq ($(STATIC_BUILD),y)
-        BASE_LIBS = $(LIBC_PREFIX)/libc.a $(LIBURCU_PREFIX)/liburcu.a $(LIBSOFTINT_PREFIX)/libsoftint.a
-        LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
+        BASE_LIBS = $(LIBC_PREFIX)/libc.a $(LIBSOFTINT_PREFIX)/libsoftint.a
         ifeq ($(MATH),y)
                 BASE_LIBS += $(LIBMATH_PREFIX)/libmath.a
@@ -205 +184 @@
 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
 
@@ -301 +286 @@
 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)
@@ -378 +358 @@
 endif
 
-ifneq ($(SLIBRARY),)
-$(SLIBRARY).la: $(LOBJECTS)
+ifneq ($(LARCHIVE),)
+$(LARCHIVE): $(LOBJECTS)
         $(AR) rc $@ $(LOBJECTS)
 endif