Changes in uspace/lib/posix/Makefile [65c28f7:3a37751] in mainline

File:

• uspace/lib/posix/Makefile (modified) (5 diffs)

uspace/lib/posix/Makefile

@@ -30 +30 @@
 USPACE_PREFIX = ../..
 LIBRARY = libposix
-SLIBRARY = libposix.so.0.0
-LSONAME = libposix.so.0
 
 EXTRA_CFLAGS = -Iinclude/
@@ -41 +39 @@
 FIXED_POSIX_LIBRARY = libposixaslibc.a
 FIXED_C_LIBRARY = libc4posix.a
+MERGED_C_LIBRARY = libc.a
+MERGE_LIBRARIES = \
+        $(FIXED_C_LIBRARY) \
+        $(FIXED_POSIX_LIBRARY) \
+        $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a \
+        $(LIBSOFTINT_PREFIX)/libsoftint.a
 
 REDEFS_HIDE_LIBC = redefs-hide-libc-symbols.list
@@ -49 +53 @@
 EXTRA_CLEAN = \
         $(INCLUDE_LIBC) \
-        $(REDEFS_HIDE_LIBC) $(REDEFS_SHOW_LIBPOSIX) \
-        $(COLLISIONS_LIST)
-EXTRA_OUTPUT = $(FIXED_C_LIBRARY) $(FIXED_POSIX_LIBRARY)
+        $(REDEFS_HIDE_LIBC) \
+        $(REDEFS_SHOW_LIBPOSIX) \
+        $(COLLISIONS_LIST) \
+        libc.o
+
+EXTRA_OUTPUT = $(FIXED_C_LIBRARY) $(FIXED_POSIX_LIBRARY) $(MERGED_C_LIBRARY)
 
 SOURCES = \
@@ -89 +96 @@
         ln -s -f -n ../$^ $@
 
-$(FIXED_C_LIBRARY): $(REDEFS_HIDE_LIBC) $(REDEFS_SHOW_LIBPOSIX)
+$(FIXED_C_LIBRARY): $(LIBC_FILE) $(REDEFS_HIDE_LIBC) $(REDEFS_SHOW_LIBPOSIX)
         $(OBJCOPY) --redefine-syms=$(REDEFS_HIDE_LIBC) $(LIBC_FILE) $@
         $(OBJCOPY) --redefine-syms=$(REDEFS_SHOW_LIBPOSIX) $@ $@
@@ -96 +103 @@
         $(OBJCOPY) --redefine-syms=$(REDEFS_HIDE_LIBC) $(LIBRARY).a $@
         $(OBJCOPY) --redefine-syms=$(REDEFS_SHOW_LIBPOSIX) $@ $@
+
+$(MERGED_C_LIBRARY): $(MERGE_LIBRARIES)
+        $(LD) --fatal-warnings -r -o libc.o --whole-archive $(MERGE_LIBRARIES) --no-whole-archive
+        $(AR) rc $@ libc.o
 
 $(REDEFS_HIDE_LIBC): $(COLLISIONS_LIST)