From ecd1128f5b9ff2e748b2aa54db917c800a7b1ee6 Mon Sep 17 00:00:00 2001 From: gary Date: Mon, 14 Feb 2011 16:00:28 +0000 Subject: [PATCH] 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 --- libjava/ChangeLog | 6 ++++++ libjava/contrib/aot-compile-rpm.in | 4 ++-- libjava/contrib/aot-compile.in | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index f74b61a..733c786 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,11 @@ 2011-02-14 Gary Benson + * 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 + 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 c3bdb16..7d95632 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 ## ## 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 b891f20..91cfc67 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 ## ## 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 -- 2.7.4