diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-05-03 21:59:35 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-05-03 21:59:35 +0000 |
| commit | ab7eb292307152e706948a7b19164ff5e6d593d4 (patch) | |
| tree | a76fc69e4f140734b2f958be40d7a9e418a75353 /elf/Makefile | |
| parent | 68536096c87890d8ebab1b9c9f0791cf9948e681 (diff) | |
| download | glibc-ab7eb292307152e706948a7b19164ff5e6d593d4.tar glibc-ab7eb292307152e706948a7b19164ff5e6d593d4.tar.gz glibc-ab7eb292307152e706948a7b19164ff5e6d593d4.tar.bz2 glibc-ab7eb292307152e706948a7b19164ff5e6d593d4.zip | |
Update.
* elf/Makefile (trusted-dirs.st): Use gen-trusted-dirs.awk.
* elf/gen-trusted-dirs.awk: New file.
* elf/dl-load.c (systems_dirs): Moved into file scope. Initialize
from SYSTEM_DIRS macro.
(system_dirs_len): New variable. Contains lengths of system_dirs
strings.
(fillin_rpath): Rewrite for systems_dirs being a simple string.
Improve string comparisons. Change parameter trusted to be a flag.
Change all callers.
(_dt_init_paths): Improve using new format for system_dirs.
Diffstat (limited to 'elf/Makefile')
| -rw-r--r-- | elf/Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/elf/Makefile b/elf/Makefile index 0fcb1b2e55..26a08322df 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -155,10 +155,8 @@ endif $(objpfx)trusted-dirs.h: $(objpfx)trusted-dirs.st; @: $(objpfx)trusted-dirs.st: Makefile $(..)Makeconfig $(make-target-directory) - dirs="$(subst :, ,$(default-rpath) $(user-defined-trusted-dirs))"; \ - for dir in $$dirs; do \ - echo " \"$$dir/\","; \ - done > ${@:st=T} + echo "$(subst :, ,$(default-rpath) $(user-defined-trusted-dirs))" \ + | $(AWK) -f gen-trusted-dirs.awk > ${@:st=T}; $(move-if-change) ${@:st=T} ${@:st=h} touch $@ CPPFLAGS-dl-load.c = -I$(objpfx). |