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

Changeset f5b2522 in mainline


Ignore:
Timestamp:
2011-07-07T03:34:03Z (10 years ago)
Author:
Petr Koupy <petr.koupy@…>
Branches:
lfn, master
Children:
8cd8bf6
Parents:
10fdd0e
Message:

Changed behaviour of clean routine. Removed conflict between toolchain and binaries.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • boot/Makefile.common

    r10fdd0e rf5b2522  
    168168ifeq ($(CONFIG_BINUTILS),y)
    169169RD_APPS_NON_ESSENTIAL += \
    170         $(USPACE_PATH)/app/binutils/as \
    171         $(USPACE_PATH)/app/binutils/ld
     170        $(USPACE_PATH)/app/binutils/bin/as \
     171        $(USPACE_PATH)/app/binutils/bin/ld
    172172endif
    173173
  • uspace/app/binutils/Makefile

    r10fdd0e rf5b2522  
    3030space = $(nullstring) # space
    3131
     32# When redefined to 'y' on the command line, certain areas of this Makefile
     33# behave slightly differently to simplify the maintenance of binutils port.
     34MAINTAIN_BINUTILS=n
     35
    3236# Information for obtaining specific binutils redistributable package.
    3337# Might be subject to change in the future.
     
    4246# File to detect the presence of binutils source tree.
    4347REDIST_DETECT = $(REDIST_DIR)/configure
     48
     49# Directory for resulting binutils binaries.
     50BIN_DIR = ./bin
    4451
    4552# $USPACE_PREFIX have to be based on the absolute path,
     
    146153                $(CONFOBJ_OBJECT) $(BINUTILS_CONFIGURED) $(REDIST_DETECT)
    147154        make -C $(REDIST_DIR) $(MAKE_TARGETS)
    148         cp -f $(REDIST_DIR)/gas/as-new ./as
    149         cp -f $(REDIST_DIR)/ld/ld-new ./ld
     155        cp -f $(REDIST_DIR)/gas/as-new $(BIN_DIR)/as
     156        cp -f $(REDIST_DIR)/ld/ld-new $(BIN_DIR)/ld
    150157else
    151158all:
     
    206213# Clean binutils.
    207214# Unpatch binutils.
     215# Delete everything in redist folder.
    208216# Delete generated scripts.
    209217clean: $(BINUTILS_PATCH) clean_
    210         rm -f as ld
     218        rm -f $(BIN_DIR)/as $(BIN_DIR)/ld
    211219        rm -f $(CONFOBJ_SOURCE) $(CONFOBJ_OBJECT)
     220ifeq ($(MAINTAIN_BINUTILS),y)
    212221        if [ -e $(REDIST_DIR)/Makefile ]; then \
    213222                make -C $(REDIST_DIR) distclean; \
     
    217226                rm -f $(BINUTILS_PATCHED); \
    218227        fi
     228else
     229        rm -r -f redist/*
     230        rm -f $(BINUTILS_PATCHED)
     231endif
    219232        rm -f $(TOOLCHAIN)
    220233        rm -f $(COMMON_MAKEFILE_PATCHED)
Note: See TracChangeset for help on using the changeset viewer.