Changes in uspace/Makefile.common [6480827:95d45482] in mainline

File:

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

uspace/Makefile.common

@@ -120 +120 @@
                 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
+                ifeq ($(CONFIG_USE_SHARED_LIBS),y)
+                        STATIC_BUILD = n
                 else
                         STATIC_BUILD = y
@@ -308 +300 @@
 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
 
@@ -381 +369 @@
         $(AR) rc $@ $(LOBJECTS)
 
-$(SLIBRARY): $(LIBRARY).la $(LIBTAGS)
+$(SLIBRARY): $(LIBRARY).la
         $(CC) $(CFLAGS) $(LIB_LDFLAGS) $(EXTRA_LDFLAGS) -Wl,-Map,$@.map -o $@ -Wl,--whole-archive $(LIBRARY).la -Wl,--no-whole-archive $(LIBARGS) $(BASE_LIBS)