Changeset bf49001 in mainline

Timestamp:

2011-05-24T03:41:01Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

d1671a8

Parents:

864a081 (diff), 2d2b8e6 (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 libposix changes.

Location:

uspace

Files:

• Makefile (modified) (1 diff)
• Makefile.common (modified) (3 diffs)
• lib/posix/Makefile (added)

uspace/Makefile

@@ -153 +153 @@
         lib/drv \
         lib/packet \
-        lib/net
+        lib/net \
+        lib/posix
 
 LIBC_BUILD = $(addsuffix .build,$(LIBC))

uspace/Makefile.common

@@ -44 +44 @@
 #   EXTRA_CLEAN        additional cleanup targets
 #
+#   POSIX_COMPAT       set to 'y' to use POSIX compatibility layer
+#
 # Optionally, for a binary:
 #   STATIC_NEEDED      set to 'y' for init binaries, will build statically
@@ -104 +106 @@
 LIBSOFTINT_PREFIX = $(LIB_PREFIX)/softint
 
+LIBPOSIX_PREFIX = $(LIB_PREFIX)/posix
+
 LIBBLOCK_PREFIX = $(LIB_PREFIX)/block
 LIBFS_PREFIX = $(LIB_PREFIX)/fs
@@ -197 +201 @@
 JOBFILE = $(LIBC_PREFIX)/../../../tools/jobfile.py
 
+ifeq ($(POSIX_COMPAT),y)
+        CFLAGS = -I$(LIBPOSIX_PREFIX)
+        LIBS += $(LIBPOSIX_PREFIX)/libposix.a
+endif
+
 ifeq ($(COMPILER),gcc_cross)
-        CFLAGS = $(GCC_CFLAGS) $(EXTRA_CFLAGS)
+        CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
 ifeq ($(COMPILER),gcc_native)
-        CFLAGS = $(GCC_CFLAGS) $(EXTRA_CFLAGS)
+        CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
 ifeq ($(COMPILER),icc)
-        CFLAGS = $(ICC_CFLAGS) $(EXTRA_CFLAGS)
+        CFLAGS += $(ICC_CFLAGS) $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
 ifeq ($(COMPILER),clang)
-        CFLAGS = $(CLANG_CFLAGS) $(EXTRA_CFLAGS)
+        CFLAGS += $(CLANG_CFLAGS) $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif