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). --- ldso/util/ldconfig.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'ldso/util') diff --git a/ldso/util/ldconfig.c b/ldso/util/ldconfig.c index 5c041f8b8..55f79f773 100644 --- a/ldso/util/ldconfig.c +++ b/ldso/util/ldconfig.c @@ -684,10 +684,8 @@ int main(int argc, char **argv) free(extpath); } - scan_dir(UCLIBC_INSTALL_DIR"/usr/lib"); - scan_dir(UCLIBC_INSTALL_DIR"/lib"); - scan_dir("/usr/lib"); - scan_dir("/lib"); + scan_dir(UCLIBC_ROOT_DIR "/usr/lib"); + scan_dir(UCLIBC_ROOT_DIR "/lib"); } if (!nocache) -- cgit v1.2.3