646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
13 lines
605 B
Diff
13 lines
605 B
Diff
diff -ru glibc-2.20-orig/elf/rtld.c glibc-2.20/elf/rtld.c
|
|
--- glibc-2.20-orig/elf/rtld.c 2014-09-07 10:09:09.000000000 +0200
|
|
+++ glibc-2.20/elf/rtld.c 2014-10-27 11:32:25.203043157 +0100
|
|
@@ -1513,7 +1513,7 @@
|
|
open(). So we do this first. If it succeeds we do almost twice
|
|
the work but this does not matter, since it is not for production
|
|
use. */
|
|
- static const char preload_file[] = "/etc/ld.so.preload";
|
|
+ static const char preload_file[] = "/etc/ld-nix.so.preload";
|
|
if (__glibc_unlikely (__access (preload_file, R_OK) == 0))
|
|
{
|
|
/* Read the contents of the file. */
|