diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-08-04 13:50:50 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-08-04 13:50:50 +0000 |
| commit | f53dda320b61bb606a58ff461dc3d41cba0c536d (patch) | |
| tree | bd9bf8ec7cc3d3b591ef5f5bd4457dbf781acc82 /gcc/ada/make.adb | |
| parent | 79500ea01a1a06d39f68bd5445053a302a2ca901 (diff) | |
| download | gcc-f53dda320b61bb606a58ff461dc3d41cba0c536d.tar.gz | |
2011-08-04 Robert Dewar <dewar@adacore.com>
* exp_ch5.adb, exp_ch7.adb, exp_util.adb, bindgen.adb, sem_prag.adb,
s-tassta.adb, exp_ch4.adb, exp_disp.adb, s-stausa.adb: Minor
reformatting.
2011-08-04 Arnaud Charlet <charlet@adacore.com>
* make.adb (Linking_Phase): Set source search path before calling
gnatlink in CodePeer mode.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@177388 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/make.adb')
| -rw-r--r-- | gcc/ada/make.adb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gcc/ada/make.adb b/gcc/ada/make.adb index cc62e7f897b..ec5cfb0f610 100644 --- a/gcc/ada/make.adb +++ b/gcc/ada/make.adb @@ -4357,16 +4357,16 @@ package body Make is end if; end; end if; - end if; -- Put the object directories in ADA_OBJECTS_PATH + -- Ditto for source directories in ADA_INCLUDE_PATH in CodePeer mode Prj.Env.Set_Ada_Paths (Main_Project, Project_Tree, Including_Libraries => False, - Include_Path => False); + Include_Path => CodePeer_Mode); -- Check for attributes Linker'Linker_Options in projects other than -- the main project @@ -4581,7 +4581,6 @@ package body Make is new String'("-F=" & Get_Name_String (Mapping_Path)); end if; end if; - end if; begin |