From dd4d42c2b998b2b95912ac04106fb7a9b1b0a57e Mon Sep 17 00:00:00 2001 From: Manuel Novoa III Date: Thu, 31 May 2001 21:23:20 +0000 Subject: 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). --- extra/Configs/Config.arm | 33 ++++++++++++++++++--------------- extra/Configs/Config.i386 | 33 ++++++++++++++++++--------------- extra/Configs/Config.m68k | 33 ++++++++++++++++++--------------- extra/Configs/Config.mips | 33 ++++++++++++++++++--------------- extra/Configs/Config.mipsel | 33 ++++++++++++++++++--------------- extra/Configs/Config.powerpc | 33 ++++++++++++++++++--------------- extra/Configs/Config.sh | 34 ++++++++++++++++++---------------- extra/Configs/Config.x86 | 33 ++++++++++++++++++--------------- 8 files changed, 144 insertions(+), 121 deletions(-) (limited to 'extra/Configs') diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm index 603ae7e07..85f3cab74 100644 --- a/extra/Configs/Config.arm +++ b/extra/Configs/Config.arm @@ -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 /lib and /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 /usr/include, +# and for static libs and crt0.o in /usr/lib. +# Also, 'make install' will install the compiler tools to +# /bin and /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 = diff --git a/extra/Configs/Config.i386 b/extra/Configs/Config.i386 index 47d422289..0897d9a1f 100644 --- a/extra/Configs/Config.i386 +++ b/extra/Configs/Config.i386 @@ -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 /lib and /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 /usr/include, +# and for static libs and crt0.o in /usr/lib. +# Also, 'make install' will install the compiler tools to +# /bin and /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 = diff --git a/extra/Configs/Config.m68k b/extra/Configs/Config.m68k index f1f8ed8e7..8ae75d2fb 100644 --- a/extra/Configs/Config.m68k +++ b/extra/Configs/Config.m68k @@ -129,23 +129,26 @@ DOLFS = false # disabled. This is off by default. INCLUDE_RPC = true -# 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 /lib and /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 /usr/include, +# and for static libs and crt0.o in /usr/lib. +# Also, 'make install' will install the compiler tools to +# /bin and /usr/bin. # -INSTALL_DIR = /opt/uClinux/$(TARGET_ARCH)-pic-elf +# 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 = /opt/uClinux/$(TARGET_ARCH)-pic-elf +TARGET_PREFIX = # # ARCH_CFLAGS if your have something special to add to the CFLAGS diff --git a/extra/Configs/Config.mips b/extra/Configs/Config.mips index a3a45c623..ea989a596 100644 --- a/extra/Configs/Config.mips +++ b/extra/Configs/Config.mips @@ -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 /lib and /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 /usr/include, +# and for static libs and crt0.o in /usr/lib. +# Also, 'make install' will install the compiler tools to +# /bin and /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 = diff --git a/extra/Configs/Config.mipsel b/extra/Configs/Config.mipsel index a3a45c623..ea989a596 100644 --- a/extra/Configs/Config.mipsel +++ b/extra/Configs/Config.mipsel @@ -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 /lib and /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 /usr/include, +# and for static libs and crt0.o in /usr/lib. +# Also, 'make install' will install the compiler tools to +# /bin and /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 = diff --git a/extra/Configs/Config.powerpc b/extra/Configs/Config.powerpc index 703298958..6b96f8c77 100644 --- a/extra/Configs/Config.powerpc +++ b/extra/Configs/Config.powerpc @@ -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 /lib and /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 /usr/include, +# and for static libs and crt0.o in /usr/lib. +# Also, 'make install' will install the compiler tools to +# /bin and /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 = diff --git a/extra/Configs/Config.sh b/extra/Configs/Config.sh index 77a0b0b1a..82ff6daf3 100644 --- a/extra/Configs/Config.sh +++ b/extra/Configs/Config.sh @@ -150,21 +150,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 /lib and /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 /usr/include, +# and for static libs and crt0.o in /usr/lib. +# Also, 'make install' will install the compiler tools to +# /bin and /usr/bin. # -INSTALL_DIR = /opt/uClinux/$(TARGET_ARCH)-pic-elf - +# 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 = /opt/uClinux/$(TARGET_ARCH)-pic-elf +TARGET_PREFIX = 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 /lib and /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 /usr/include, +# and for static libs and crt0.o in /usr/lib. +# Also, 'make install' will install the compiler tools to +# /bin and /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 = -- cgit v1.2.3