wrapper.exp (${tool}_maybe_build_wrapper): Set up GCC_EXEC_PREFIX before building...

* lib/wrapper.exp (${tool}_maybe_build_wrapper): Set up
GCC_EXEC_PREFIX before building the wrapper.

From-SVN: r150889

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a0c52bdd01c12c6ebbf56675741b7d5bb22846e8..385c982c88dc38c0bf39469d2cbd3eb5c70968e5 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-18  DJ Delorie  <dj@redhat.com>
+
+       * lib/wrapper.exp (${tool}_maybe_build_wrapper): Set up
+       GCC_EXEC_PREFIX before building the wrapper.
+
 2009-08-18  Nathan Froyd  <froydnj@codesourcery.com>
 
        * gcc.dg/vect/vect.exp: Add new stanza for aligned-section-anchors-*

diff --git a/gcc/testsuite/lib/wrapper.exp b/gcc/testsuite/lib/wrapper.exp
index 4e5ae435a13eb99b1c74c341e19c1839de2b90f4..fba7324ece4d8befe13286cc9a15da99e51254c2 100644 (file)
--- a/gcc/testsuite/lib/wrapper.exp
+++ b/gcc/testsuite/lib/wrapper.exp
@@ -16,6 +16,8 @@
 
 # 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
@@ -27,6 +29,7 @@ proc ${tool}_maybe_build_wrapper { filename args } {
     if { [target_info needs_status_wrapper] != "" \
         && [target_info needs_status_wrapper] != "0" \
         && ![info exists gluefile] } {
+       set_ld_library_path_env_vars
        set saved_wrap_compile_flags [target_info wrap_compile_flags]
        set flags [join $args " "]
        # The wrapper code may contain code that gcc objects on.  This