From 5bf40a9b1506bc286b77602b6347544e8ca3ab3c Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Wed, 17 Nov 2021 07:32:58 -0600 Subject: [PATCH] Check if intel command are detected properly. If intel exec commands are not detected we try to use the result anyway which would error. This adds checks that prevent the errors to let the sequence of attempts work. fixes #109 --- src/tools/intel-linux.jam | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/tools/intel-linux.jam b/src/tools/intel-linux.jam index 54afab6a8..5405ff55a 100644 --- a/src/tools/intel-linux.jam +++ b/src/tools/intel-linux.jam @@ -93,23 +93,32 @@ rule init ( version ? : command * : options * ) { local bin_paths = $(.bin(oneAPI)) ; detected_command = [ common.find-tool icpx : $(bin_paths) ] ; - command_abs_path = [ common.get-absolute-tool-path $(detected_command) ] ; - command_lib_path = $(command_abs_path)/../compiler/lib/intel64 ; + if $(detected_command) + { + command_abs_path = [ common.get-absolute-tool-path $(detected_command) ] ; + command_lib_path = $(command_abs_path)/../compiler/lib/intel64 ; + } } if ! $(detected_command) { local bin_paths = $(.bin(12.0)) $(.bin(11.1)) $(.bin(11.0)) ; detected_command = [ common.find-tool icpc : $(bin_paths) ] ; - command_abs_path = [ common.get-absolute-tool-path $(detected_command) ] ; - command_lib_path = $(command_abs_path)/../lib/x86_64 ; + if $(detected_command) + { + command_abs_path = [ common.get-absolute-tool-path $(detected_command) ] ; + command_lib_path = $(command_abs_path)/../lib/x86_64 ; + } } if ! $(detected_command) { local bin_paths = $(.bin(10.1)) $(.bin(9.1)) $(.bin(9.0)) $(.bin(8.1)) $(.bin(8.0)) ; detected_command = [ common.find-tool icpc : $(bin_paths) ] ; - command_abs_path = [ common.get-absolute-tool-path $(detected_command) ] ; - command_lib_path = $(command_abs_path)/../lib ; + if $(detected_command) + { + command_abs_path = [ common.get-absolute-tool-path $(detected_command) ] ; + command_lib_path = $(command_abs_path)/../lib ; + } } if $(detected_command) {