diff mbox series

[pushed] Revert "libstdc++: Fix LD_LIBRARY_PATH when testing an installed compiler"

Message ID 20260716222654.1667859-1-aarsenovic@baylibre.com
State Committed
Headers
Series [pushed] Revert "libstdc++: Fix LD_LIBRARY_PATH when testing an installed compiler" |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gcc_build--master-aarch64 fail Patch failed to apply
linaro-tcwg-bot/tcwg_simplebootstrap_build--master-arm-bootstrap fail Patch failed to apply
linaro-tcwg-bot/tcwg_gcc_build--master-arm fail Patch failed to apply
linaro-tcwg-bot/tcwg_simplebootstrap_build--master-aarch64-bootstrap fail Patch failed to apply

Commit Message

Arsen Arsenović July 16, 2026, 10:26 p.m. UTC 
  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 <jakub@redhat.com>
---
Yeah, I think that's correct; reverting for now (as that fixes tests in
the immediate term).

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

Patch

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.