From 67d7b0ab5ffd3d67e804732cdb74299300db18b6 Mon Sep 17 00:00:00 2001 From: Vincent Celier Date: Thu, 31 Jul 2008 14:46:11 +0200 Subject: [PATCH] makeutl.adb (Executable_Prefix_Path): If Locate_Exec_On_Path fails... 2008-07-31 Vincent Celier * makeutl.adb (Executable_Prefix_Path): If Locate_Exec_On_Path fails, return the empty string, instead of raising Constraint_Error. From-SVN: r138398 --- gcc/ada/makeutl.adb | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gcc/ada/makeutl.adb b/gcc/ada/makeutl.adb index 1755ade229c..a0a909d1ae7 100644 --- a/gcc/ada/makeutl.adb +++ b/gcc/ada/makeutl.adb @@ -246,7 +246,17 @@ package body Makeutl is -- If we get here, the user has typed the executable name with no -- directory prefix. - return Get_Install_Dir (Locate_Exec_On_Path (Exec_Name).all); + declare + Path : constant String_Access := Locate_Exec_On_Path (Exec_Name); + + begin + if Path = null then + return ""; + + else + return Get_Install_Dir (Path.all); + end if; + end; end Executable_Prefix_Path; ---------- -- 2.30.2