Changeset 6c5fc8e in mainline


Ignore:
Timestamp:
2012-10-25T20:10:50Z (12 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
ea906c29
Parents:
aebcd42
Message:

Prevent compile-time symlinks for ABI

See previous two commits for details, this change
handles include path regarding the abi/ directory.

Files:
3 edited
17 moved

Legend:

Unmodified
Added
Removed

  • kernel/Makefile

    raebcd42 r6c5fc8e  
    5959REAL_MAP = generic/src/debug/real_map
    6060
    61 ABI_INCLUDE = generic/include/abi
    62 
    6361GENMAP = tools/genmap.py
    6462JOBFILE = $(ROOT_PATH)/tools/jobfile.py
    … …  
    7472
    7573clean:
    76         rm -f $(DEPEND) $(DEPEND_PREV) $(RAW) $(BIN) $(MAP) $(JOB) $(MAP_PREV) $(DISASM) $(DUMP) $(REAL_MAP).* $(ABI_INCLUDE) arch/*/_link.ld arch/*/include/arch/common.h
     74        rm -f $(DEPEND) $(DEPEND_PREV) $(RAW) $(BIN) $(MAP) $(JOB) $(MAP_PREV) $(DISASM) $(DUMP) $(REAL_MAP).* arch/*/_link.ld arch/*/include/arch/common.h
    7775        find generic/src/ arch/*/src/ genarch/src/ test/ -name '*.o' -follow -exec rm \{\} \;
    7876
    … …  
    8078#
    8179
    82 INCLUDES = generic/include genarch/include arch/$(KARCH)/include
     80INCLUDES = generic/include genarch/include arch/$(KARCH)/include ../abi/include
    8381INCLUDES_FLAGS = $(addprefix -I,$(INCLUDES))
    8482
    … …  
    434432        $(GENMAP) $(MAP_PREV) $(DUMP) $@
    435433
    436 $(DEPEND): $(ABI_INCLUDE) $(COMMON_HEADER_ARCH)
     434$(DEPEND): $(COMMON_HEADER_ARCH)
    437435        makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(ARCH_SOURCES) $(GENARCH_SOURCES) $(GENERIC_SOURCES) > $@ 2> /dev/null
    438436        -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@
    439437
    440 $(ABI_INCLUDE): ../abi/include/
    441         ln -sfn ../../$< $@
    442 
    443438$(COMMON_HEADER_ARCH): $(COMMON_HEADER)
    444439        ln -sfn ../../../../$< $@

  • uspace/Makefile.common

    raebcd42 r6c5fc8e  
    103103
    104104LIBC_PREFIX = $(LIB_PREFIX)/c
    105 LIBC_INCLUDES_FLAGS = -I$(LIBC_PREFIX)/include -I$(LIBC_PREFIX)/arch/$(UARCH)/include
     105LIBC_INCLUDES_FLAGS = \
     106        -I$(LIBC_PREFIX)/include \
     107        -I$(LIBC_PREFIX)/arch/$(UARCH)/include \
     108        -I$(ROOT_PATH)/abi/include
    106109LIBSOFTFLOAT_PREFIX = $(LIB_PREFIX)/softfloat
    107110LIBSOFTINT_PREFIX = $(LIB_PREFIX)/softint

  • uspace/lib/c/Makefile

    raebcd42 r6c5fc8e  
    3131ROOT_PATH = $(USPACE_PREFIX)/..
    3232
    33 INCLUDE_ABI = include/abi
    34 
    3533COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
    3634COMMON_HEADER = $(ROOT_PATH)/common.h
    … …  
    4543        $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld
    4644
    47 PRE_DEPEND = $(INCLUDE_ABI) $(COMMON_HEADER_ARCH)
     45PRE_DEPEND = $(COMMON_HEADER_ARCH)
    4846EXTRA_OUTPUT = $(LINKER_SCRIPTS)
    49 EXTRA_CLEAN = $(INCLUDE_ABI) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPTS)
     47EXTRA_CLEAN = $(COMMON_HEADER_ARCH) $(LINKER_SCRIPTS)
    5048LIBRARY = libc
    5149SLIBRARY = libc.so.0.0
    … …  
    156154include $(USPACE_PREFIX)/Makefile.common
    157155
    158 $(INCLUDE_ABI): ../../../abi/include/
    159         ln -sfn ../$< $@
    160156
    161157$(LIBC_PREFIX)/arch/$(UARCH)/_link.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
Note: See TracChangeset for help on using the changeset viewer.