Changes in uspace/Makefile.common [83b64a59:6480827] in mainline

File:

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

uspace/Makefile.common

@@ -46 +46 @@
 #   STATIC_NEEDED      set to 'y' for init binaries, will build statically
 #                      linked version
+#   STATIC_ONLY        set to 'y' if binary cannot be linked dynamically
+#                      (e.g. uses thread-local variables)
 #
 # Optionally, for a library:
@@ -112 +114 @@
 LDFLAGS = -Wl,--fatal-warnings,--warn-common
 
-STATIC_BUILD = n
-
 ifeq ($(STATIC_NEEDED),y)
         STATIC_BUILD = y
-endif
-
-ifneq ($(CONFIG_BUILD_SHARED_LIBS),y)
-        STATIC_BUILD = y
-endif
-
-ifneq ($(CONFIG_USE_SHARED_LIBS),y)
-        ifeq ($(LIBRARY),)
+else
+        ifeq ($(STATIC_ONLY),y)
                 STATIC_BUILD = y
+        else
+                ifeq ($(CONFIG_BUILD_SHARED_LIBS),y)
+                        ifeq ($(CONFIG_USE_SHARED_LIBS),y)
+                                STATIC_BUILD = n
+                        else
+                                ifeq ($(LIBRARY),)
+                                        STATIC_BUILD = y
+                                else
+                                        STATIC_BUILD = n
+                                endif
+                        endif
+                else
+                        STATIC_BUILD = y
+                endif
         endif
 endif
 
-ifeq ($(STATIC_BUILD),y)
-        LDFLAGS += -static
+ifneq ($(STATIC_BUILD),y)
+        LINK_DYNAMIC = y
 endif
 
@@ -144 +152 @@
 BASE_LIBS += -lgcc
 
+ifneq ($(LINK_DYNAMIC),y)
+        LDFLAGS += -static
+endif
+
 INCLUDES_FLAGS = $(LIBC_INCLUDES_FLAGS)
 
@@ -152 +164 @@
 INCLUDES_FLAGS += $(foreach lib,$(LIBS), -I$(LIB_PREFIX)/$(lib) -I$(LIB_PREFIX)/$(lib)/include)
 
-DEPLIBS := $(LIBS)
-
-ifneq ($(filter %.cpp %.cc %.cxx, $(SOURCES)),)
-        ifneq ($(LIBRARY),libcpp)
-                DEPLIBS += cpp
-        endif
-endif
-
-ifneq ($(LIBRARY),libc)
-        DEPLIBS += c
+# TODO: get rid of this special case
+ifneq ($(filter math, $(LIBS)),)
+        INCLUDES_FLAGS += $(LIBMATH_INCLUDES_FLAGS)
 endif
 
@@ -300 +305 @@
 DEPENDS := $(addsuffix .d,$(basename $(SOURCES))) $(addsuffix .test.d,$(basename $(TEST_SOURCES)))
 
-LIBTAGS := $(foreach lib,$(DEPLIBS), $(USPACE_PREFIX)/lib/$(lib)/tag)
+LIBTAGS := $(foreach lib,$(LIBS), $(USPACE_PREFIX)/lib/$(lib)/tag)
 LIBARGS := $(addprefix -L$(USPACE_PREFIX)/lib/, $(LIBS)) $(addprefix -l, $(LIBS))
+
+ifneq ($(LIBRARY),libc)
+        LIBTAGS := $(LIBC_PREFIX)/tag $(LIBTAGS)
+endif
 
 .PHONY: all all-test clean fasterclean depend
@@ -330 +339 @@
 deps.mk: Makefile
         echo > $@.new
-        for lib in $(DEPLIBS); do \
+        for lib in $(LIBS); do \
                 echo "$(SELF_TARGET): lib/$$lib.build" >> $@.new; \
         done