From 98dea683a2c4c46b7718f737dd4f63e1f1228693 Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Sat, 9 Dec 2006 11:19:22 +0000 Subject: [PATCH] Handle negative exit codes [SVN r36308] --- v2/tools/msvc.jam | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/v2/tools/msvc.jam b/v2/tools/msvc.jam index 1597826e9..d90860909 100644 --- a/v2/tools/msvc.jam +++ b/v2/tools/msvc.jam @@ -846,7 +846,7 @@ if [ os.name ] in NT actions link bind DEF_FILE { $(.LD) $(LINKFLAGS) /out:"$(<[1]:W)" /LIBPATH:"$(LINKPATH:W)" $(OPTIONS) @"@($(<[1]:W).rsp:E=$(nl)"$(>)" $(nl)$(LIBRARIES_MENTIONED_BY_FILE) $(nl)$(LIBRARIES) $(nl)"$(LIBRARY_OPTION)$(FINDLIBS_ST:S=.lib)" $(nl)"$(LIBRARY_OPTION)$(FINDLIBS_SA:S=.lib)")" - if errorlevel 1 exit %errorlevel% + if %ERRORLEVEL% NEQ 0 EXIT %ERRORLEVEL% if exist "$(<[1]).manifest" ( $(.MT) -manifest "$(<[1]).manifest" "-outputresource:$(<[1]);1" ) @@ -855,7 +855,7 @@ if [ os.name ] in NT actions link.dll bind DEF_FILE { $(.LD) /DLL $(LINKFLAGS) /out:"$(<[1]:W)" /IMPLIB:"$(<[2]:W)" /LIBPATH:"$(LINKPATH:W)" /def:$(DEF_FILE) $(OPTIONS) @"@($(<[1]:W).rsp:E=$(nl)"$(>)" $(nl)$(LIBRARIES_MENTIONED_BY_FILE) $(nl)$(LIBRARIES) $(nl)"$(LIBRARY_OPTION)$(FINDLIBS_ST:S=.lib)" $(nl)"$(LIBRARY_OPTION)$(FINDLIBS_SA:S=.lib)")" - if errorlevel 1 exit %errorlevel% + if %ERRORLEVEL% NEQ 0 EXIT %ERRORLEVEL% if exist "$(<[1]).manifest" ( $(.MT) -manifest "$(<[1]).manifest" "-outputresource:$(<[1]);2" )