From a54d0eb4b0cb6335ddff8b01aad449a0d31fe6fb Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Thu, 4 Aug 2011 17:18:34 +0200 Subject: [multiple changes] 2011-08-04 Robert Dewar * sem_ch3.adb, make.adb, a-cohata.ads, sem_prag.adb, makeutl.adb, lib-xref-alfa.adb: Minor reformatting. 2011-08-04 Marc Sango * sem_ch12.adb (Analyze_Generic_Package_Declaration, Analyze_Generic_Subprogram_Declaration, Analyze_Package_Instantiation, Analyze_Subprogram_Instantiation): Check absence of generic in SPARK mode. 2011-08-04 Tristan Gingold * bindgen.adb (Gen_Adainit_C): Remove. (Gen_Adafinal_C): Ditto. (Gen_Elab_Externals_C): Ditto. (Gen_Elab_Calls_C): Ditto. (Gen_Elab_Order_C): Ditto. (Gen_Elab_Defs_C): Ditto. (Gen_Finalize_Library_C): Ditto. (Gen_Finalize_Library_Defs_C): Ditto. (Gen_Main_C): Ditto. (Gen_Output_File_C): Ditto. (Gen_Restrictions_C): Ditto. (Gen_Versions_C): Ditto. (Write_Info_Ada_C): Ditto. (Gen_Object_Files_Options): Call WBI instead of Write_Info_Ada_C (Gen_Output_File): Do not force Ada_Bind_File anymore. Always call Gen_Output_File_Ada. * gnatlink.adb (Begin_Info): Now a constant. (End_Info): Ditto. (Ada_Bind_File): Remove (Process_Args): Do not handle -A/-C. Remove not Ada_Bind_File cases. * switch-b.adb (Scan_Binder_Switches): Do not handle -C. * gnatbind.adb (Gnatbind): Remove not Ada_Bind_File cases. * opt.ads (Ada_Bind_File): Remove. 2011-08-04 Thomas Quinot * projects.texi: Document target-specific directory in default project path for gnatmake. 2011-08-04 Thomas Quinot * gnatls.adb, prj-env.adb: Add $prefix/share/gpr to default project path in all cases . From-SVN: r177395 --- gcc/ada/prj-env.adb | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'gcc/ada/prj-env.adb') diff --git a/gcc/ada/prj-env.adb b/gcc/ada/prj-env.adb index 5f5b831..0c66142 100644 --- a/gcc/ada/prj-env.adb +++ b/gcc/ada/prj-env.adb @@ -1982,7 +1982,6 @@ package body Prj.Env is if Add_Default_Dir then declare Prefix : String_Ptr; - Add_Prefix_Share_Gpr : Boolean; begin if Sdefault.Search_Dir_Prefix = null then @@ -1990,7 +1989,6 @@ package body Prj.Env is -- gprbuild case Prefix := new String'(Executable_Prefix_Path); - Add_Prefix_Share_Gpr := True; else Prefix := new String'(Sdefault.Search_Dir_Prefix.all @@ -1998,7 +1996,6 @@ package body Prj.Env is & ".." & Dir_Separator & ".." & Dir_Separator & ".." & Dir_Separator); - Add_Prefix_Share_Gpr := False; end if; if Prefix.all /= "" then @@ -2021,14 +2018,11 @@ package body Prj.Env is ("lib" & Directory_Separator & "gnat"); end if; - if Add_Prefix_Share_Gpr then + -- $prefix/share/gpr - -- $prefix/share/gpr - - Add_Str_To_Name_Buffer - (Path_Separator & Prefix.all & - "share" & Directory_Separator & "gpr"); - end if; + Add_Str_To_Name_Buffer + (Path_Separator & Prefix.all & + "share" & Directory_Separator & "gpr"); -- $prefix/lib/gnat -- cgit v1.1