diff options
| author | gary <gary@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-02-14 16:00:28 +0000 |
|---|---|---|
| committer | gary <gary@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-02-14 16:00:28 +0000 |
| commit | ecd1128f5b9ff2e748b2aa54db917c800a7b1ee6 (patch) | |
| tree | baa392b5a78c6c74ab3d240b781db4b6592154da /libjava | |
| parent | b1db14708853d307fe1335c6c82efc355f06c165 (diff) | |
| download | ppe42-gcc-ecd1128f5b9ff2e748b2aa54db917c800a7b1ee6.tar.gz ppe42-gcc-ecd1128f5b9ff2e748b2aa54db917c800a7b1ee6.zip | |
Insert libgcj's Python module directory at the start of the search
path, rather than at the end.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@170138 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/contrib/aot-compile-rpm.in | 4 | ||||
| -rw-r--r-- | libjava/contrib/aot-compile.in | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index f74b61aba0b..733c786ea8e 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,11 @@ 2011-02-14 Gary Benson <gbenson@redhat.com> + * libjava/contrib/aot-compile.in: Add our module directory + to the start of the search path rather than the end. + * libjava/contrib/aot-compile-rpm.in: Likewise. + +2011-02-14 Gary Benson <gbenson@redhat.com> + PR libjava/47484 * configure.ac (python_mod_dir, python_mod_dir_expanded): Install Python modules into versioned directory. diff --git a/libjava/contrib/aot-compile-rpm.in b/libjava/contrib/aot-compile-rpm.in index c3bdb165096..7d95632555d 100644 --- a/libjava/contrib/aot-compile-rpm.in +++ b/libjava/contrib/aot-compile-rpm.in @@ -1,6 +1,6 @@ #!/usr/bin/env python -## Copyright (C) 2005, 2006, 2007 Free Software Foundation +## Copyright (C) 2005, 2006, 2007, 2011 Free Software Foundation ## Written by Gary Benson <gbenson@redhat.com> ## ## This program is free software; you can redistribute it and/or modify @@ -14,7 +14,7 @@ ## GNU General Public License for more details. import sys -sys.path.append("@python_mod_dir_expanded@") +sys.path.insert(0, "@python_mod_dir_expanded@") import aotcompile import os diff --git a/libjava/contrib/aot-compile.in b/libjava/contrib/aot-compile.in index b891f20b85f..91cfc67d99c 100644 --- a/libjava/contrib/aot-compile.in +++ b/libjava/contrib/aot-compile.in @@ -1,6 +1,6 @@ #!/usr/bin/env python -## Copyright (C) 2006 Free Software Foundation +## Copyright (C) 2006, 2011 Free Software Foundation ## Written by Gary Benson <gbenson@redhat.com> ## ## This program is free software; you can redistribute it and/or modify @@ -14,7 +14,7 @@ ## GNU General Public License for more details. import sys -sys.path.append("@python_mod_dir_expanded@") +sys.path.insert(0, "@python_mod_dir_expanded@") import aotcompile import getopt import os |
