diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-11-15 14:05:30 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-11-15 14:05:30 +0000 |
| commit | 782c8d16e619ccb9017d2ace34c337426d1c2e3c (patch) | |
| tree | c8c0214f8548fc9f765b31c6ab8a74a3686229ef /gcc/ada/makegpr.adb | |
| parent | 049792bf885f2246036aa68cef550fd5d9192746 (diff) | |
| download | gcc-782c8d16e619ccb9017d2ace34c337426d1c2e3c.tar.gz | |
2005-11-14 Vincent Celier <celier@adacore.com>
* makegpr.adb (Gprmake): Do not attempt to build the global archive if
there is no object directory.
2005-11-14 Robert Dewar <dewar@adacore.com>
* usage.adb: Minor adjustment to output format, use nn instead of nnn
(so that -gnateInnn does not run into next column)
2005-11-14 Ed Falis <falis@adacore.com>
* s-bitops.adb (Bits_Array): corrected comment: "unconstrained" =>
"constrained"
2005-11-14 Cyrille Comar <comar@adacore.com>
* s-chepoo.ads: Add comments on Dereference.
Remove unnecessary inherited abstract primitives.
Cosmetic cleanup.
2005-11-14 Robert Dewar <dewar@adacore.com>
* sem_cat.ads (Validate_Access_Type_Declaration): Remove declaration
node parameter, not needed, since it is available as Declaration_Node.
2005-11-14 Geert Bosch <bosch@adacore.com>
* s-exnllf.adb (Exn_LLF): Fix comment to be more precise and
grammatically correct.
2005-11-14 Vincent Celier <celier@adacore.com>
* s-fileio.ads: Correct spelling error in comment
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@107014 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/makegpr.adb')
| -rw-r--r-- | gcc/ada/makegpr.adb | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/gcc/ada/makegpr.adb b/gcc/ada/makegpr.adb index 951e77815fd..2e8f5c22355 100644 --- a/gcc/ada/makegpr.adb +++ b/gcc/ada/makegpr.adb @@ -129,7 +129,7 @@ package body Makegpr is -- ar commands. Archive_Indexer_Path : String_Access := null; - -- The path name of the archive indexer (ranlib), if it exists. + -- The path name of the archive indexer (ranlib), if it exists Copyright_Output : Boolean := False; Usage_Output : Boolean := False; @@ -356,7 +356,7 @@ package body Makegpr is procedure Add_Argument (Arg : String_Access; Display : Boolean); procedure Add_Argument (Arg : String; Display : Boolean); - -- Add an argument to Arguments. Reallocate if necessary. + -- Add an argument to Arguments. Reallocate if necessary procedure Add_Arguments (Args : Argument_List; Display : Boolean); -- Add a list of arguments to Arguments. Reallocate if necessary @@ -2015,7 +2015,7 @@ package body Makegpr is end if; end; - -- If the source path name ends the line, we are done. + -- If the source path name ends the line, we are done exit Line_Loop when Finish = Last; @@ -2609,7 +2609,7 @@ package body Makegpr is -- Keep_Going is True, to inhibit the building of the archive. Need_To_Compile : Boolean; - -- Set to True when a source needs to be compiled/recompiled. + -- Set to True when a source needs to be compiled/recompiled Need_To_Rebuild_Archive : Boolean := Force_Compilations; -- True when the archive needs to be built/rebuilt unconditionally @@ -3217,7 +3217,10 @@ package body Makegpr is -- If -c was not specified, link the executables, -- if there are any. - if not Compile_Only and then not Data.Library then + if not Compile_Only + and then not Data.Library + and then Data.Object_Directory /= No_Name + then Build_Global_Archive; Link_Executables; end if; @@ -3677,7 +3680,7 @@ package body Makegpr is -- project. Any main that is not a source of the other languages -- will be deemed to be an Ada main. - -- Find the mains of the other languages and the Ada mains. + -- Find the mains of the other languages and the Ada mains Mains.Reset; Ada_Mains.Set_Last (0); |