OSDN Git Service
(root)
/
pf3gnuchains
/
gcc-fork.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2009-04-24 Vincent Celier <celier@adacore.com>
[pf3gnuchains/gcc-fork.git]
/
gcc
/
ada
/
prj-nmsc.adb
diff --git
a/gcc/ada/prj-nmsc.adb
b/gcc/ada/prj-nmsc.adb
index
5098883
..
451c678
100644
(file)
--- a/
gcc/ada/prj-nmsc.adb
+++ b/
gcc/ada/prj-nmsc.adb
@@
-3461,7
+3461,9
@@
package body Prj.Nmsc is
Continuation := Continuation_String'Access;
end if;
Continuation := Continuation_String'Access;
end if;
- elsif Data.Library_Kind /= Static then
+ elsif (not Unchecked_Shared_Lib_Imports)
+ and then Data.Library_Kind /= Static
+ then
Error_Msg
(Project, In_Tree,
Continuation.all &
Error_Msg
(Project, In_Tree,
Continuation.all &
@@
-3485,17
+3487,18
@@
package body Prj.Nmsc is
"shared library project %% cannot extend static " &
"library project %%",
Data.Location);
"shared library project %% cannot extend static " &
"library project %%",
Data.Location);
+ Continuation := Continuation_String'Access;
- els
e
+ els
if not Unchecked_Shared_Lib_Imports then
Error_Msg
(Project, In_Tree,
Continuation.all &
"shared library project %% cannot import static " &
"library project %%",
Data.Location);
Error_Msg
(Project, In_Tree,
Continuation.all &
"shared library project %% cannot import static " &
"library project %%",
Data.Location);
+ Continuation := Continuation_String'Access;
end if;
end if;
- Continuation := Continuation_String'Access;
end if;
end if;
end Check_Library;
end if;
end if;
end Check_Library;