Changes in / [d900699:98caf49] in mainline


Ignore:
Files:
34 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • HelenOS.config

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

    rd900699 r98caf49  
    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
    103102
    104103clean:
  • boot/Makefile.common

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

    rd900699 r98caf49  
    113113        drv/vhc
    114114
    115 ifeq ($(CONFIG_BINUTILS),y)
    116 DIRS += \
    117         app/binutils
    118 endif
    119 
    120115## Networking
    121116#
     
    180175        lib/usbdev \
    181176        lib/usbhid \
    182         lib/usbvirt \
    183         lib/posix
     177        lib/usbvirt
    184178
    185179LIBC_BUILD = $(addsuffix .build,$(LIBC))
  • uspace/Makefile.common

    rd900699 r98caf49  
    4444#   EXTRA_CLEAN        additional cleanup targets
    4545#
    46 #   POSIX_COMPAT       set to 'y' to use POSIX compatibility layer
    47 #
    4846# Optionally, for a binary:
    4947#   STATIC_NEEDED      set to 'y' for init binaries, will build statically
     
    106104LIBSOFTINT_PREFIX = $(LIB_PREFIX)/softint
    107105
    108 LIBPOSIX_PREFIX = $(LIB_PREFIX)/posix
    109 
    110106LIBBLOCK_PREFIX = $(LIB_PREFIX)/block
    111107LIBFS_PREFIX = $(LIB_PREFIX)/fs
     
    215211JOBFILE = $(LIBC_PREFIX)/../../../tools/jobfile.py
    216212
    217 ifeq ($(POSIX_COMPAT),y)
    218         CFLAGS = -I$(LIBPOSIX_PREFIX)
    219         LIBS += $(LIBPOSIX_PREFIX)/libposix.a
    220 endif
    221 
    222213ifeq ($(COMPILER),gcc_cross)
    223         CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)
     214        CFLAGS = $(GCC_CFLAGS) $(EXTRA_CFLAGS)
    224215        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    225216endif
    226217
    227218ifeq ($(COMPILER),gcc_native)
    228         CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)
     219        CFLAGS = $(GCC_CFLAGS) $(EXTRA_CFLAGS)
    229220        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    230221endif
    231222
    232223ifeq ($(COMPILER),icc)
    233         CFLAGS += $(ICC_CFLAGS) $(EXTRA_CFLAGS)
     224        CFLAGS = $(ICC_CFLAGS) $(EXTRA_CFLAGS)
    234225        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    235226endif
    236227
    237228ifeq ($(COMPILER),clang)
    238         CFLAGS += $(CLANG_CFLAGS) $(EXTRA_CFLAGS)
     229        CFLAGS = $(CLANG_CFLAGS) $(EXTRA_CFLAGS)
    239230        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    240231endif
Note: See TracChangeset for help on using the changeset viewer.