diff options
| author | Manuel Novoa III <mjn3@codepoet.org> | 2001-05-31 21:23:20 +0000 |
|---|---|---|
| committer | Manuel Novoa III <mjn3@codepoet.org> | 2001-05-31 21:23:20 +0000 |
| commit | dd4d42c2b998b2b95912ac04106fb7a9b1b0a57e (patch) | |
| tree | 19bdbd5e7c1fc93edcd14b115fdbdf3be205389d /extra/Configs/Config.x86 | |
| parent | f43cd38254b0f915fcade2f61218430ebb5e3db3 (diff) | |
Removed INSTALL_DIR and replaced it with DEVEL_PREFIX, ROOT_DIR, and
TARGET_PREFIX to allow more flexibility. Also modified the gcc wrapper
to do the right thing if -Wl,--dynamic-linker,xxx is passed on the command
line. The gcc wrapper will also check the env variable UCLIBC_GCC_LDOPT
for a dynamic linker option at runtime (although command line arg overrides
the env variable).
Diffstat (limited to 'extra/Configs/Config.x86')
| -rw-r--r-- | extra/Configs/Config.x86 | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/extra/Configs/Config.x86 b/extra/Configs/Config.x86 index 47d422289..0897d9a1f 100644 --- a/extra/Configs/Config.x86 +++ b/extra/Configs/Config.x86 @@ -129,20 +129,23 @@ DOLFS = false # disabled. This is off by default. INCLUDE_RPC = false -# Installation location. For the default uClinux installation from -# Lineo for m68k, it should be: -# /opt/uClinux/m68k-pic-coff -# so includes installed in: /opt/uClinux/m68k-pic-coff/include -# libc.a and crt0.o in: /opt/uClinux/m68k-pic-coff/lib -# -# For ARM it should be: -# /opt/uClinux/arm-pic-elf -# so includes installed in: /opt/uClinux/arm-pic-elf/include -# libc.a and crt0.o in: /opt/uClinux/arm-pic-elf/lib +# ROOT_DIR is the base directory which will be compiled into the uClibc +# runtime environment. When compiled as a shared library, the shared +# library loader will look in <ROOT_DIR>/lib and <ROOT_DIR>/usr/lib +# for shared libraries. # -# For x86 this should be: -# /usr/i386-linux-uclibc -# so includes installed in: /usr/i386-linux-uclibc/include -# libc.a, libc.so.#, crt0.o in: /usr/i386-linux-uclibc/lib +# DEVEL_PREFIX is the base directory which will be compiled into the uClibc +# development environment. The uClibc development environment will +# look for the uClibc header files under <DEVEL_PREFIX><ROOT_DIR>/usr/include, +# and for static libs and crt0.o in <DEVEL_PREFIX><ROOT_DIR>/usr/lib. +# Also, 'make install' will install the compiler tools to +# <DEVEL_PREFIX><ROOT_DIR>/bin and <DEVEL_PREFIX><ROOT_DIR>/usr/bin. # -INSTALL_DIR = /usr/$(TARGET_ARCH)-linux-uclibc +# TARGET_PREFIX is the directory under which 'make install' will install the +# uClibc runtime environment. This path does not get compiled into anything, +# and is provided simply to make it easier to build standalone target systems. +# Note: This doesn't do anything if there are no shared libs. + +DEVEL_PREFIX = +ROOT_DIR = /usr/$(TARGET_ARCH)-linux-uclibc +TARGET_PREFIX = |