aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnaud Charlet <charlet@gcc.gnu.org>2005-01-03 16:39:36 +0100
committerArnaud Charlet <charlet@gcc.gnu.org>2005-01-03 16:39:36 +0100
commitfa0d36062d9931c9fc76073b402b60a650f9c1a2 (patch)
tree70f6049e037b61971d1381c8f0d1eb1d33ebecdf
parent8711f4199e1308712cca2a598e4ff5c2365c5882 (diff)
downloadgcc-fa0d36062d9931c9fc76073b402b60a650f9c1a2.zip
gcc-fa0d36062d9931c9fc76073b402b60a650f9c1a2.tar.gz
gcc-fa0d36062d9931c9fc76073b402b60a650f9c1a2.tar.bz2
make.adb (Collect_Arguments_And_Compile): Do not attempt to build libraries when Unique_Compile is True (-u switch).
* make.adb (Collect_Arguments_And_Compile): Do not attempt to build libraries when Unique_Compile is True (-u switch). (Gnatmake): ditto. From-SVN: r92843
-rw-r--r--gcc/ada/make.adb8
1 files changed, 6 insertions, 2 deletions
diff --git a/gcc/ada/make.adb b/gcc/ada/make.adb
index 7d9be71..eb57773 100644
--- a/gcc/ada/make.adb
+++ b/gcc/ada/make.adb
@@ -2224,7 +2224,9 @@ package body Make is
if not Projects.Table (Arguments_Project).Externally_Built then
Prj.Env.Set_Ada_Paths (Arguments_Project, True);
- if MLib.Tgt.Support_For_Libraries /= MLib.Tgt.None then
+ if not Unique_Compile
+ and then MLib.Tgt.Support_For_Libraries /= MLib.Tgt.None
+ then
declare
The_Data : Project_Data :=
Projects.Table (Arguments_Project);
@@ -4352,7 +4354,9 @@ package body Make is
-- put all the project sources in the queue, and flag the project
-- so that the library is generated.
- if MLib.Tgt.Support_For_Libraries /= MLib.Tgt.None then
+ if not Unique_Compile
+ and then MLib.Tgt.Support_For_Libraries /= MLib.Tgt.None
+ then
for Proj in Projects.First .. Projects.Last loop
if Projects.Table (Proj).Library then
Projects.Table (Proj).Need_To_Build_Lib :=