diff options
| author | Rob Savoye <rob@welcomehome.org> | 2001-05-02 01:55:05 +0000 |
|---|---|---|
| committer | Rob Savoye <rob@welcomehome.org> | 2001-05-02 01:55:05 +0000 |
| commit | 08b9fa821d1ca971c8503369c0b49b543e635603 (patch) | |
| tree | 892f4622c1d77f9b6872721681c24f767fce6be1 | |
| parent | ad5950c28155a9583b19cff68d3e7546d126c5f2 (diff) | |
2001-05-01 Matt Hiller <hiller@redhat.com>
* lib/libgloss.exp (get_multilibs): Correction to Catherine
Moore's patch of 2000-06-09.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | lib/libgloss.exp | 9 |
2 files changed, 12 insertions, 4 deletions
@@ -1,10 +1,15 @@ +2001-05-01 Matt Hiller <hiller@redhat.com> + + * lib/libgloss.exp (get_multilibs): Correction to Catherine + Moore's patch of 2000-06-09. + 2001-04-11 Rob Savoye <rob@slipknot.welcomehome.org> * Clean.tcl: Add -r to rm, so it gets rid of CVS directories. * .clean: Don't install the debian or redhat packaging directories. * Makefle.am: Install dejagnu.h. Fix dist2 target, so we build our own tarballs, instead of letting automake do it for us. - * examples/cala/Makefile.am: Use noist_PROGRAMS, so calc doesn't + * examples/calc/Makefile.am: Use noist_PROGRAMS, so calc doesn't get installed. * doc/Makefile.am: Install the man page for runtest. * configure.in: Make VERSION 1.4.0, not just 1.4, so distributions diff --git a/lib/libgloss.exp b/lib/libgloss.exp index 8c5bf87..98c8d53 100644 --- a/lib/libgloss.exp +++ b/lib/libgloss.exp @@ -1,4 +1,4 @@ -# Copyright (C) 92, 93, 94, 95, 96, 97, 98, 1999 Free Software Foundation, Inc. +# Copyright (C) 92 - 2000, 2001 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -421,12 +421,15 @@ proc get_multilibs { args } { # set output [exec $objdump_name --file-headers objfmtst.o ] set default_multilib [exec $compiler --print-multi-lib] set default_multilib [lindex $default_multilib 0]; - set extra [string trimleft $default_multilib "."] + set extra [string trimleft $default_multilib ".;@"] # extract the options and their directory names as know by gcc foreach i "[exec $compiler --print-multi-lib]" { if {$extra != ""} { - set i [string trimright $i $extra"] + # string trimright would do the wrong thing if we included + # the leading @ in $extra + set i [string trimright $i $extra] + set i [string trimright $i "@"] } set opts "" set dir "" |