Changeset aebcd42 in mainline


Ignore:
Timestamp:
2012-10-24T21:58:08Z (12 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
6c5fc8e
Parents:
6ecf5b8
Message:

Prevent compile-time symlinks in userspace

Continuation of the previous commit (see details there).

Only abi/ remains to be done.

Location:
uspace
Files:
63 added
63 deleted
2 edited
109 moved

Legend:

Unmodified
Added
Removed

  • uspace/Makefile.common

    r6ecf5b8 raebcd42  
    103103
    104104LIBC_PREFIX = $(LIB_PREFIX)/c
     105LIBC_INCLUDES_FLAGS = -I$(LIBC_PREFIX)/include -I$(LIBC_PREFIX)/arch/$(UARCH)/include
    105106LIBSOFTFLOAT_PREFIX = $(LIB_PREFIX)/softfloat
    106107LIBSOFTINT_PREFIX = $(LIB_PREFIX)/softint
    … …  
    181182        find . -name '*.lo' -follow -exec rm \{\} \;
    182183
    183 GCC_CFLAGS = -I$(LIBC_PREFIX)/include -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
     184GCC_CFLAGS = $(LIBC_INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
    184185        -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
    185186        -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
    … …  
    188189        -pipe -g -D__$(ENDIANESS)__
    189190
    190 ICC_CFLAGS = -I$(LIBC_PREFIX)/include -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
     191ICC_CFLAGS = $(LIBC_INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
    191192        -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
    192193        -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
    … …  
    195196        -pipe -g -D__$(ENDIANESS)__
    196197
    197 CLANG_CFLAGS = -I$(LIBC_PREFIX)/include -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
     198CLANG_CFLAGS = $(LIBC_INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
    198199        -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
    199200        -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \

  • uspace/lib/c/Makefile

    r6ecf5b8 raebcd42  
    3232
    3333INCLUDE_ABI = include/abi
    34 INCLUDE_LIBARCH = include/libarch
    3534
    3635COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
    3736COMMON_HEADER = $(ROOT_PATH)/common.h
    38 COMMON_HEADER_ARCH = arch/$(UARCH)/include/common.h
     37COMMON_HEADER_ARCH = arch/$(UARCH)/include/libarch/common.h
    3938
    4039CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
    … …  
    4645        $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld
    4746
    48 PRE_DEPEND = $(INCLUDE_ABI) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH)
     47PRE_DEPEND = $(INCLUDE_ABI) $(COMMON_HEADER_ARCH)
    4948EXTRA_OUTPUT = $(LINKER_SCRIPTS)
    50 EXTRA_CLEAN = $(INCLUDE_ABI) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPTS)
     49EXTRA_CLEAN = $(INCLUDE_ABI) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPTS)
    5150LIBRARY = libc
    5251SLIBRARY = libc.so.0.0
    … …  
    157156include $(USPACE_PREFIX)/Makefile.common
    158157
    159 $(INCLUDE_LIBARCH): arch/$(UARCH)/include
    160         ln -sfn ../$< $@
    161 
    162158$(INCLUDE_ABI): ../../../abi/include/
    163159        ln -sfn ../$< $@
    … …  
    176172
    177173$(COMMON_HEADER_ARCH): $(COMMON_HEADER)
    178         ln -sfn ../../../$< $@
     174        ln -sfn ../../../../$< $@
Note: See TracChangeset for help on using the changeset viewer.