diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | baseboards/multi-sim.exp | 14 |
2 files changed, 11 insertions, 12 deletions
@@ -1,3 +1,12 @@ +2016-03-15 Ben Elliston <bje@gnu.org> + + Revert this change: + 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. + 2016-03-13 Ben Elliston <bje@gnu.org> * lib/utils.exp: Whitespace fixes. 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] |