aboutsummaryrefslogtreecommitdiff
path: root/baseboards
diff options
context:
space:
mode:
authorBen Elliston <bje@gnu.org>2016-03-15 07:27:54 +1100
committerBen Elliston <bje@gnu.org>2016-03-15 07:27:54 +1100
commit7e0630a1b2e585ee7f91d890dd5d5c04b00f2eff (patch)
tree7584d06c056ce5957681e05f06d469ad7cda2ae3 /baseboards
parent73626ccc1e9716127bff40e9153b1ae014307212 (diff)
downloaddejagnu-7e0630a1b2e585ee7f91d890dd5d5c04b00f2eff.zip
dejagnu-7e0630a1b2e585ee7f91d890dd5d5c04b00f2eff.tar.gz
dejagnu-7e0630a1b2e585ee7f91d890dd5d5c04b00f2eff.tar.bz2
This reverts commit ef5f4a8c80f8d652e5415d0fdb159dcf51af52d3:
2016-02-14 Steve Ellcey <sellcey@mips.com> * baseboards/multi-sim.exp (dynamic_linker_flag): Check GCC_UNDER_TEST. * baseboards/multi-sim.exp (rpath_flags): Ditto.
Diffstat (limited to 'baseboards')
-rw-r--r--baseboards/multi-sim.exp14
1 files changed, 2 insertions, 12 deletions
diff --git a/baseboards/multi-sim.exp b/baseboards/multi-sim.exp
index 58902a5..c057ccd 100644
--- a/baseboards/multi-sim.exp
+++ b/baseboards/multi-sim.exp
@@ -42,12 +42,7 @@ load_base_board_description "basic-sim"
proc get_library_dirlist { args } {
global board
- global GCC_UNDER_TEST
- if [info exists GCC_UNDER_TEST] then {
- set compiler $GCC_UNDER_TEST
- } else {
- set compiler "[board_info $board compiler]"
- }
+ set compiler "[board_info $board compiler]"
set mflags "[board_info $board multilib_flags]"
set result [remote_exec host "$compiler $mflags --print-search-dirs"]
set regresult [regexp {(libraries: =)(\S*)} $result dummy1 dummy2 libdirlist]
@@ -71,12 +66,7 @@ proc dynamic_linker_flag { args } {
proc rpath_flags { args } {
global board
- global GCC_UNDER_TEST
- if [info exists GCC_UNDER_TEST] then {
- set compiler $GCC_UNDER_TEST
- } else {
- set compiler "[board_info $board compiler]"
- }
+ set compiler "[board_info $board compiler]"
set mflags "[board_info $board multilib_flags] [libgloss_include_flags] [newlib_include_flags] [libgloss_link_flags] [libgloss_link_flags]"
set rpathflags ""
set gccpath [get_multilibs]