[gcc r17-2476] Revert "libstdc++: Fix LD_LIBRARY_PATH when testing an installed compiler"

https://gcc.gnu.org/g:58ce322cb0ca9369d5a9aced23731e25b150ce00

commit r17-2476-g58ce322cb0ca9369d5a9aced23731e25b150ce00
Author: Arsen Arsenović <[email protected]>
Date:   Thu Jul 16 23:17:25 2026 +0200

    Revert "libstdc++: Fix LD_LIBRARY_PATH when testing an installed compiler"
    
    I somehow missed that this breaks parallel testing.  I intend to
    reintroduce the fix for installed compilers over the weekend.
    
    This reverts commit 7f2bba0d2d08219e79ab6ba543be42ccdb37a760.
    
    Reported-by: Jakub Jelinek <[email protected]>

Diff:
---
 libstdc++-v3/testsuite/lib/libstdc++.exp | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index d1e40524c19b..b44c240fa526 100644
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -75,7 +75,6 @@ load_gcc_lib timeout.exp
 load_gcc_lib timeout-dg.exp
 load_gcc_lib wrapper.exp
 load_gcc_lib target-utils.exp
-load_gcc_lib gcc-defs.exp
 load_gcc_lib dg-test-cleanup.exp
 
 # Useful for debugging.  Pass the name of a variable and the verbosity
@@ -248,14 +247,13 @@ proc libstdc++_init { testfile } {
 	    }
 	  }
 	}
+
+	set_ld_library_path_env_vars
+	if [info exists env(LD_LIBRARY_PATH)] {
+	  verbose -log "LD_LIBRARY_PATH = $env(LD_LIBRARY_PATH)"
+	}
     } else {
 	set compiler [transform "g++"]
-	append ld_library_path [gcc-set-multilib-library-path $compiler]
-    }
-
-    set_ld_library_path_env_vars
-    if [info exists env(LD_LIBRARY_PATH)] {
-	verbose -log "LD_LIBRARY_PATH = $env(LD_LIBRARY_PATH)"
     }
 
     # Set the default timeout for v3 tests.