Merge pull request #657 from stilor/no-ldsoconf

Make creation of ld.so.conf optional

1 files changed, 20 insertions, 0 deletions

diff --git a/config/libc.in b/config/libc.in
index cd3ccec..e05934f 100644
--- a/config/libc.in
+++ b/config/libc.in
@@ -87,6 +87,26 @@ config THREADS_NONE
 
 endchoice
 
+config CREATE_LDSO_CONF
+    bool "Create /etc/ld.so.conf file"
+    depends on SHARED_LIBS
+    default y if MULTILIB
+    help
+      Create /etc/ld.so.conf file in the sysroot directory for the
+      target.
+
+      Note that Buildroot errors out if it sees /etc/ld.so.conf.
+
+config LDSO_CONF_EXTRA_DIRS_ARRAY
+    string "Extra directories to add to /etc/ld.so.conf
+    depends on CREATE_LDSO_CONF
+    help
+      Extra directories to include in /etc/ld.so.conf. The directories
+      will be augmented per compiler's multilib specification,
+      if applicable. For example, if the compiler's multilibs include
+      /lib and /lib64, and you specify /usr/local/lib here, ld.so.conf
+      will have both /usr/local/lib and /usr/local/lib64.
+
 config LIBC_XLDD
     bool
     prompt "Install a cross ldd-like helper"