*** empty log message ***

[binutils-gdb.git] / gdb / main.c

diff --git a/gdb/main.c b/gdb/main.c
index 030c6818df9200670d7ffea686c353a4dea04b45..c5c712acff8c67608286ec29188e76b2c2e4da3a 100644 (file)
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -68,6 +68,10 @@ char *gdb_sysroot = 0;
 /* GDB datadir, used to store data files.  */
 char *gdb_datadir = 0;
 
+/* If gdb was configured with --with-python=/path,
+   the possibly relocated path to python's lib directory.  */
+char *python_libdir = 0;
+
 struct ui_file *gdb_stdout;
 struct ui_file *gdb_stderr;
 struct ui_file *gdb_stdlog;
@@ -143,6 +147,7 @@ relocate_directory (const char *progname, const char *initial, int flag)
   if (*dir)
     {
       char *canon_sysroot = lrealpath (dir);
+
       if (canon_sysroot)
        {
          xfree (dir);
@@ -350,6 +355,14 @@ captured_main (void *data)
   gdb_datadir = relocate_directory (argv[0], GDB_DATADIR,
                                    GDB_DATADIR_RELOCATABLE);
 
+#ifdef WITH_PYTHON_PATH
+  /* For later use in helping Python find itself.  */
+  python_libdir = relocate_directory (argv[0],
+                                     concat (WITH_PYTHON_PATH,
+                                             SLASH_STRING, "lib", NULL),
+                                     PYTHON_PATH_RELOCATABLE);
+#endif
+
 #ifdef RELOC_SRCDIR
   add_substitute_path_rule (RELOC_SRCDIR,
                            make_relative_prefix (argv[0], BINDIR,
@@ -742,6 +755,7 @@ Excess command line arguments ignored. (%s%s)\n"),
   {
     /* Find it.  */
     struct interp *interp = interp_lookup (interpreter_p);
+
     if (interp == NULL)
       error (_("Interpreter `%s' unrecognized"), interpreter_p);
     /* Install it.  */