From 40986754d7550f7e1e69289a30db4fccaa99aeb1 Mon Sep 17 00:00:00 2001 From: DJ Delorie <dj@redhat.com> Date: Tue, 18 Aug 2009 21:40:24 -0400 Subject: [PATCH] wrapper.exp: Move load of target-libpath.exp from here... * lib/wrapper.exp: Move load of target-libpath.exp from here... * lib/gcc-defs.exp: ... to here. From-SVN: r150929 --- gcc/testsuite/ChangeLog | 3 +++ gcc/testsuite/lib/gcc-defs.exp | 2 ++ gcc/testsuite/lib/wrapper.exp | 2 -- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 385c982c88dc..ea60d928e8b7 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2009-08-18 DJ Delorie <dj@redhat.com> + * lib/wrapper.exp: Move load of target-libpath.exp from here... + * lib/gcc-defs.exp: ... to here. + * lib/wrapper.exp (${tool}_maybe_build_wrapper): Set up GCC_EXEC_PREFIX before building the wrapper. diff --git a/gcc/testsuite/lib/gcc-defs.exp b/gcc/testsuite/lib/gcc-defs.exp index 53926a69a232..776456d60926 100644 --- a/gcc/testsuite/lib/gcc-defs.exp +++ b/gcc/testsuite/lib/gcc-defs.exp @@ -14,6 +14,8 @@ # along with GCC; see the file COPYING3. If not see # <http://www.gnu.org/licenses/>. +load_lib target-libpath.exp + load_lib wrapper.exp # diff --git a/gcc/testsuite/lib/wrapper.exp b/gcc/testsuite/lib/wrapper.exp index fba7324ece4d..b7f7773aac5a 100644 --- a/gcc/testsuite/lib/wrapper.exp +++ b/gcc/testsuite/lib/wrapper.exp @@ -16,8 +16,6 @@ # This file contains GCC-specifics for status wrappers for test programs. -load_lib target-libpath.exp - # ${tool}_maybe_build_wrapper -- Build wrapper object if the target # needs it. FILENAME is the path to the wrapper file. If there are # additional arguments, they are command-line options to provide to -- GitLab