Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 65b4aac1 in mainline


Ignore:
Timestamp:
2011-07-23T20:14:32Z (10 years ago)
Author:
Petr Koupy <petr.koupy@…>
Branches:
lfn, master
Children:
df217a6
Parents:
e16e2ba4 (diff), cfbb5d18 (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:
47 added
2 edited

Legend:

Unmodified
Added
Removed
  • uspace/Makefile

    re16e2ba4 r65b4aac1  
    175175        lib/usbdev \
    176176        lib/usbhid \
    177         lib/usbvirt
     177        lib/usbvirt \
     178        lib/posix
    178179
    179180LIBC_BUILD = $(addsuffix .build,$(LIBC))
  • uspace/Makefile.common

    re16e2ba4 r65b4aac1  
    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
     108LIBPOSIX_PREFIX = $(LIB_PREFIX)/posix
     109
    106110LIBBLOCK_PREFIX = $(LIB_PREFIX)/block
    107111LIBFS_PREFIX = $(LIB_PREFIX)/fs
     
    213217JOBFILE = $(LIBC_PREFIX)/../../../tools/jobfile.py
    214218
     219ifeq ($(POSIX_COMPAT),y)
     220        CFLAGS = -I$(LIBPOSIX_PREFIX)
     221        LIBS += $(LIBPOSIX_PREFIX)/libposix.a
     222endif
     223
    215224ifeq ($(COMPILER),gcc_cross)
    216         CFLAGS = $(GCC_CFLAGS) $(EXTRA_CFLAGS)
     225        CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)
    217226        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    218227endif
    219228
    220229ifeq ($(COMPILER),gcc_native)
    221         CFLAGS = $(GCC_CFLAGS) $(EXTRA_CFLAGS)
     230        CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)
    222231        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    223232endif
    224233
    225234ifeq ($(COMPILER),icc)
    226         CFLAGS = $(ICC_CFLAGS) $(EXTRA_CFLAGS)
     235        CFLAGS += $(ICC_CFLAGS) $(EXTRA_CFLAGS)
    227236        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    228237endif
    229238
    230239ifeq ($(COMPILER),clang)
    231         CFLAGS = $(CLANG_CFLAGS) $(EXTRA_CFLAGS)
     240        CFLAGS += $(CLANG_CFLAGS) $(EXTRA_CFLAGS)
    232241        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    233242endif
Note: See TracChangeset for help on using the changeset viewer.