diff options
| author | Geert Bosch <bosch@gnat.com> | 2001-10-10 16:48:53 +0200 |
|---|---|---|
| committer | Geert Bosch <bosch@gcc.gnu.org> | 2001-10-10 16:48:53 +0200 |
| commit | 1724557a33784a9e96fabbf2918ec87bd6eb3e20 (patch) | |
| tree | d654d86f626250bcbb15daa84beb757605984558 /gcc | |
| parent | 6d2f8887355e2d21ecc2ec4201f7b5fb86e29f81 (diff) | |
| download | gcc-1724557a33784a9e96fabbf2918ec87bd6eb3e20.zip gcc-1724557a33784a9e96fabbf2918ec87bd6eb3e20.tar.gz gcc-1724557a33784a9e96fabbf2918ec87bd6eb3e20.tar.bz2 | |
xnmake.adb (XNmake): Fix handling of -s/-b options.
* xnmake.adb (XNmake): Fix handling of -s/-b options. No longer
use '/' as switch character, allowing for absolute file names.
From-SVN: r46146
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/ada/xnmake.adb | 11 |
2 files changed, 10 insertions, 6 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index b26c87a..2357f0f 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2001-10-10 Geert Bosch <bosch@gnat.com> + + * xnmake.adb (XNmake): Fix handling of -s/-b options. No longer + use '/' as switch character, allowing for absolute file names. + 2001-10-09 Joseph S. Myers <jsm28@cam.ac.uk> * 4gintnam.ads, Make-lang.in, Makefile.in, config-lang.in: Update diff --git a/gcc/ada/xnmake.adb b/gcc/ada/xnmake.adb index f87b850..9a1f835 100644 --- a/gcc/ada/xnmake.adb +++ b/gcc/ada/xnmake.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- $Revision: 1.27 $ +-- $Revision$ -- -- -- Copyright (C) 1992-2001 Free Software Foundation, Inc. -- -- -- @@ -105,7 +105,6 @@ procedure XNmake is GetT_Rev : Pattern := BreakX ('$') & "$Rev" & "ision: " & Break (' ') * Temp_Rev; - Body_Only : Pattern := BreakX (' ') * X & Span (' ') & "-- body only"; Spec_Only : Pattern := BreakX (' ') * X & Span (' ') & "-- spec only"; @@ -208,7 +207,7 @@ procedure XNmake is begin -- Capture our revision (following line updated by RCS) - Match ("$Revision: 1.27 $", "$Rev" & "ision: " & Break (' ') * XNmake_Rev); + Match ("$Revision$", "$Rev" & "ision: " & Break (' ') * XNmake_Rev); Lineno := 0; NWidth := 28; @@ -219,7 +218,7 @@ begin Arg : constant String := Argument (ArgN); begin - if Arg (1) = '/' or else Arg (1) = '-' then + if Arg (1) = '-' then if Arg'Length = 2 and then (Arg (2) = 'b' or else Arg (2) = 'B') then @@ -248,10 +247,10 @@ begin raise Err; elsif Given_File /= Nul then - if FileS = Nul then + if FileB = Nul then FileS := Given_File; - elsif FileB = Nul then + elsif FileS = Nul then FileB := Given_File; else |