Changeset 0798689 in mainline


Ignore:
Timestamp:
2017-10-27T18:24:48Z (8 years ago)
Author:
jzr <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9b642f92
Parents:
d4da860
Message:

Reference boot arch headers directly, instead of via symlinks.

This change was previously done in kernel and uspace, but not in boot.
In addition to better consistency, this also fixes an issue with
make dependency tracking.

Location:
boot
Files:
1 added
1 deleted
2 edited
39 moved

Legend:

Unmodified
Added
Removed

  • boot/Makefile.build

    rd4da860 r0798689  
    3131include Makefile.common
    3232
    33 INCLUDES = -Igeneric/include -I$(ROOT_PATH)/abi/include
     33INCLUDES = -Igeneric/include -Iarch/$(KARCH)/include -Igenarch/include -I$(ROOT_PATH)/abi/include
    3434OPTIMIZATION = 3
    3535
    … …  
    7676
    7777clean:
    78         rm -f $(RAW) $(MAP) $(ARCH_INCLUDE) $(GENARCH_INCLUDE)
     78        rm -f $(RAW) $(MAP)
    7979
    8080-include $(DEPENDS)
    … …  
    109109endif
    110110
    111 depend: $(ARCH_INCLUDE) $(GENARCH_INCLUDE) $(PRE_DEPEND)
     111depend: $(PRE_DEPEND)
    112112
    113113$(COMPS).s: $(COMPS).zip
    … …  
    128128include Makefile.initrd
    129129
    130 $(ARCH_INCLUDE) $(ARCH_INCLUDE)/%.h: arch/$(KARCH)/include/
    131         ln -sfn ../../$< $@
    132 
    133 $(GENARCH_INCLUDE) $(GENARCH_INCLUDE)/%.h: genarch/include/
    134         ln -sfn ../../$< $@

  • boot/Makefile.common

    rd4da860 r0798689  
    5858
    5959JOBFILE = $(ROOT_PATH)/tools/jobfile.py
    60 
    61 ARCH_INCLUDE = generic/include/arch
    62 GENARCH_INCLUDE = generic/include/genarch
    6360
    6461DISTROOT = distroot
Note: See TracChangeset for help on using the changeset viewer.