summaryrefslogtreecommitdiff
path: root/gcc/ada/mlib-prj.adb
diff options
context:
space:
mode:
authorcharlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>2009-04-20 09:38:27 +0000
committercharlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4>2009-04-20 09:38:27 +0000
commit9929853e7d9bb7fa5631dc342fa0ba24622af164 (patch)
treeeb7899588c7d92f99fa0ad64e72f96baad11fbfe /gcc/ada/mlib-prj.adb
parent9429b6e934d31424545c97da2568452a83ef85f3 (diff)
downloadgcc-9929853e7d9bb7fa5631dc342fa0ba24622af164.tar.gz
2009-04-20 Thomas Quinot <quinot@adacore.com>
* g-socket.ads: Add new constants: Loopback_Inet_Addr Unspecified_Group_Inet_Addr All_Hosts_Group_Inet_Addr All_Routers_Group_Inet_Addr * s-oscons-tmplt.c, g-sttsne-vxworks.adb (System.OS_Constants): Add ERANGE (Result too large). (GNAT.Sockets.Thin.Task_Safe_NetDB, VxWorks version): Add missing propagation of errno to caller. 2009-04-20 Hristian Kirtchev <kirtchev@adacore.com> * a-calend.adb, a-calend-vms.adb: Increase the number of leap seconds to 24. Increment Leap_Seconds_Count and add an entry to aggregate Leap_Second_Times. 2009-04-20 Vincent Celier <celier@adacore.com> * mlib-prj.adb (Build_Library): Use the shared library linker, if one has been declared (Library_GCC or Linker'Driver), for the driver name. * prj-nmsc.adb (Process_Linker): If Library_GCC is not declared and Linker'Driver is, use Linker'Driver as the shared library linker. (Process_Project_Level_Simple_Attributes): Issue a warning if attribute Library_GCC is declared. (Check_Library_Attributes): Set up the shared linker driver: either Library_GCC or Linker'Driver. Issue a warning if Library_GCC is declared. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@146386 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/mlib-prj.adb')
-rw-r--r--gcc/ada/mlib-prj.adb11
1 files changed, 4 insertions, 7 deletions
diff --git a/gcc/ada/mlib-prj.adb b/gcc/ada/mlib-prj.adb
index 66951e63dd2..3256bf75491 100644
--- a/gcc/ada/mlib-prj.adb
+++ b/gcc/ada/mlib-prj.adb
@@ -340,7 +340,6 @@ package body MLib.Prj is
Success : Boolean := False;
Library_Options : Variable_Value := Nil_Variable_Value;
- Library_GCC : Variable_Value := Nil_Variable_Value;
Driver_Name : Name_Id := No_Name;
@@ -1282,13 +1281,11 @@ package body MLib.Prj is
if Link then
- -- If attribute Library_GCC was specified, get the driver name
+ -- If attributes Library_GCC or Linker'Driver were specified, get the
+ -- driver name.
- Library_GCC :=
- Value_Of (Name_Library_GCC, Data.Decl.Attributes, In_Tree);
-
- if not Library_GCC.Default then
- Driver_Name := Library_GCC.Value;
+ if Data.Config.Shared_Lib_Driver /= No_File then
+ Driver_Name := Name_Id (Data.Config.Shared_Lib_Driver);
end if;
-- If attribute Library_Options was specified, add these additional