Changeset 2af29ed in mainline


Ignore:
Timestamp:
2011-06-08T19:44:02Z (13 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
4ac901c
Parents:
1564c4b (diff), ae1c11b (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

Location:
uspace
Files:
19 added
2 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    r1564c4b r2af29ed  
    178178        lib/usbdev \
    179179        lib/usbhid \
    180         lib/usbvirt
     180        lib/usbvirt \
     181        lib/posix
    181182
    182183LIBC_BUILD = $(addsuffix .build,$(LIBC))

  • uspace/Makefile.common

    r1564c4b r2af29ed  
    4444#   EXTRA_CLEAN        additional cleanup targets
    4545#
     46#   POSIX_COMPAT       set to 'y' to use POSIX compatibility layer
     47#
    4648# Optionally, for a binary:
    4749#   STATIC_NEEDED      set to 'y' for init binaries, will build statically
    … …  
    104106LIBSOFTINT_PREFIX = $(LIB_PREFIX)/softint
    105107
    106 LIBCOMPAT_PREFIX = $(LIB_PREFIX)/compat
     108LIBPOSIX_PREFIX = $(LIB_PREFIX)/posix
    107109
    108110LIBBLOCK_PREFIX = $(LIB_PREFIX)/block
    … …  
    213215JOBFILE = $(LIBC_PREFIX)/../../../tools/jobfile.py
    214216
    215 ifeq ($(POSIX_COMPAT),1)
    216         CFLAGS = -I$(LIBCOMPAT_PREFIX)
    217         LIBS += $(LIBCOMPAT_PREFIX)/libcompat.a
     217ifeq ($(POSIX_COMPAT),y)
     218        CFLAGS = -I$(LIBPOSIX_PREFIX)
     219        LIBS += $(LIBPOSIX_PREFIX)/libposix.a
    218220endif
    219221
Note: See TracChangeset for help on using the changeset viewer.