Changes in / [98caf49:d900699] in mainline


Ignore:
Files:
34 added
5 edited

Legend:

Unmodified
Added
Removed
  • HelenOS.config

    r98caf49 rd900699  
    558558! CONFIG_BAREBONE (n/y)
    559559
     560% Build binutils binaries
     561! CONFIG_BINUTILS (n/y)
     562
    560563% Line debugging information
    561564! [CONFIG_STRIP_BINARIES!=y] CONFIG_LINE_DEBUG (n/y)
  • Makefile

    r98caf49 rd900699  
    100100distclean: clean
    101101        rm -f $(CSCOPE).out $(COMMON_MAKEFILE) $(COMMON_HEADER) $(COMMON_HEADER_PREV) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) tools/*.pyc tools/checkers/*.pyc release/HelenOS-*
     102        cd ./uspace/app/binutils/; ./distclean.sh
    102103
    103104clean:
  • boot/Makefile.common

    r98caf49 rd900699  
    166166        $(USPACE_PATH)/app/websrv/websrv
    167167
     168ifeq ($(CONFIG_BINUTILS),y)
     169RD_APPS_NON_ESSENTIAL += \
     170        $(USPACE_PATH)/app/binutils/as \
     171        $(USPACE_PATH)/app/binutils/ld
     172endif
     173
    168174ifneq ($(CONFIG_BAREBONE),y)
    169175NET_CFG = \
  • uspace/Makefile

    r98caf49 rd900699  
    113113        drv/vhc
    114114
     115ifeq ($(CONFIG_BINUTILS),y)
     116DIRS += \
     117        app/binutils
     118endif
     119
    115120## Networking
    116121#
     
    175180        lib/usbdev \
    176181        lib/usbhid \
    177         lib/usbvirt
     182        lib/usbvirt \
     183        lib/posix
    178184
    179185LIBC_BUILD = $(addsuffix .build,$(LIBC))
  • uspace/Makefile.common

    r98caf49 rd900699  
    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.