Changes in / [bf172825:f1fae414] in mainline


Ignore:
Location:
uspace
Files:
36 added
2 edited

Legend:

Unmodified
Added
Removed
  • uspace/Makefile

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

    rbf172825 rf1fae414  
    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
     
    211215JOBFILE = $(LIBC_PREFIX)/../../../tools/jobfile.py
    212216
     217ifeq ($(POSIX_COMPAT),y)
     218        CFLAGS = -I$(LIBPOSIX_PREFIX)
     219        LIBS += $(LIBPOSIX_PREFIX)/libposix.a
     220endif
     221
    213222ifeq ($(COMPILER),gcc_cross)
    214         CFLAGS = $(GCC_CFLAGS) $(EXTRA_CFLAGS)
     223        CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)
    215224        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    216225endif
    217226
    218227ifeq ($(COMPILER),gcc_native)
    219         CFLAGS = $(GCC_CFLAGS) $(EXTRA_CFLAGS)
     228        CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)
    220229        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    221230endif
    222231
    223232ifeq ($(COMPILER),icc)
    224         CFLAGS = $(ICC_CFLAGS) $(EXTRA_CFLAGS)
     233        CFLAGS += $(ICC_CFLAGS) $(EXTRA_CFLAGS)
    225234        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    226235endif
    227236
    228237ifeq ($(COMPILER),clang)
    229         CFLAGS = $(CLANG_CFLAGS) $(EXTRA_CFLAGS)
     238        CFLAGS += $(CLANG_CFLAGS) $(EXTRA_CFLAGS)
    230239        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    231240endif
Note: See TracChangeset for help on using the changeset viewer.