Changeset ab936440 in mainline for uspace/Makefile.common

Timestamp:

2019-02-12T20:42:42Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

f31ca47

Parents:

7f7817a9 (diff), 4805495 (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.

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:

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

uspace/Makefile.common

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