git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hook.in: Do not fail when there is no current objfile. 

* python/hook.in: Do not fail when there is no current objfile.
	Use os.path.normpath.

From-SVN: r148626
This commit is contained in:
Tom Tromey 2009-06-17 20:06:27 +00:00 committed by Tom Tromey
parent 2cb0a60da1
commit 6ba49852d8
2 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,8 @@
2009-06-17 Tom Tromey <tromey@redhat.com>
* python/hook.in: Do not fail when there is no current objfile.
Use os.path.normpath.
2009-06-16 Jonathan Wakely <jwakely.gcc@gmail.com>
* libsupc++/exception_ptr.h (exception_ptr::swap(exception_ptr&&)):

9
libstdc++-v3/python/hook.in
View File

@ -22,14 +22,19 @@ import os.path
pythondir = '@pythondir@'
libdir = '@toolexeclibdir@'
# This file might be loaded when there is no current objfile. This
# can happen if the user loads it manually. In this case we don't
# update sys.path; instead we just hope the user managed to do that
# beforehand.
if gdb.current_objfile () is not None:
# Update module path. We want to find the relative path from libdir
# to pythondir, and then we want to apply that relative path to the
# directory holding the objfile with which this file is associated.
# This preserves relocatability of the gcc tree.
# Do a simple normalization that removes duplicate separators.
pythondir = os.path.join (*['/'] + pythondir.split (os.sep))
libdir = os.path.join (*['/'] + libdir.split (os.sep))
pythondir = os.path.normpath (pythondir)
libdir = os.path.normpath (libdir)
prefix = os.path.commonprefix ([libdir, pythondir])
# In some bizarre configuration we might have found a match in the