From 69abd0f67ee1ff5d72274543c67afddcdc689bf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jurko=20Gospodneti=C4=87?= Date: Mon, 30 Jun 2008 18:10:23 +0000 Subject: [PATCH] Patch for different Boost Build msvc toolset issues when using it from a cygwin shell or when using Boost Jam built so it uses the cygwin shell internally. Makes some error information not be gobbled up but displayed on the screen correctly and makes include paths passed to the Windows based command line utilities be correctly converted to native Windows instead of cygwin paths. Contributed by Ilya Sokolov. [SVN r46925] --- src/tools/msvc.jam | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tools/msvc.jam b/src/tools/msvc.jam index cd277dc95..7d056aa81 100644 --- a/src/tools/msvc.jam +++ b/src/tools/msvc.jam @@ -388,7 +388,7 @@ local rule configure-really ( version ? : options * ) if ! [ os.name ] in NT { setup-prefix = "cmd.exe /S /C call " ; - setup-suffix = " >nul \"&&\" " ; + setup-suffix = " \">nul\" \"&&\" " ; } for local c in $(cpu) @@ -794,7 +794,7 @@ flags msvc.compile INCLUDES ; rule get-rspline ( target : lang-opt ) { - CC_RSPLINE on $(target) = [ on $(target) return $(lang-opt) -U$(UNDEFS) $(CFLAGS) $(C++FLAGS) $(OPTIONS) -c $(nl)-D$(DEFINES) $(nl)\"-I$(INCLUDES)\" ] ; + CC_RSPLINE on $(target) = [ on $(target) return $(lang-opt) -U$(UNDEFS) $(CFLAGS) $(C++FLAGS) $(OPTIONS) -c $(nl)-D$(DEFINES) $(nl)\"-I$(INCLUDES:W)\" ] ; } @@ -879,7 +879,7 @@ rule compile.c++.pch ( targets + : sources * : properties * ) actions compile.rc { - $(.RC) -l 0x409 -U$(UNDEFS) -D$(DEFINES) -I"$(INCLUDES)" -fo "$(<:W)" "$(>:W)" + $(.RC) -l 0x409 -U$(UNDEFS) -D$(DEFINES) -I"$(INCLUDES:W)" -fo "$(<:W)" "$(>:W)" } @@ -889,7 +889,7 @@ TOUCH_FILE = [ common.file-touch-command ] ; actions compile.idl { - $(.IDL) /nologo @"@($(<[1]:W).rsp:E=$(nl)"$(>:W)" $(nl)-D$(DEFINES) $(nl)"-I$(INCLUDES)" $(nl)-U$(UNDEFS) $(nl)$(MIDLFLAGS) $(nl)/tlb "$(<[1]:W)" $(nl)/h "$(<[2]:W)" $(nl)/iid "$(<[3]:W)" $(nl)/proxy "$(<[4]:W)" $(nl)/dlldata "$(<[5]:W)")" + $(.IDL) /nologo @"@($(<[1]:W).rsp:E=$(nl)"$(>:W)" $(nl)-D$(DEFINES) $(nl)"-I$(INCLUDES:W)" $(nl)-U$(UNDEFS) $(nl)$(MIDLFLAGS) $(nl)/tlb "$(<[1]:W)" $(nl)/h "$(<[2]:W)" $(nl)/iid "$(<[3]:W)" $(nl)/proxy "$(<[4]:W)" $(nl)/dlldata "$(<[5]:W)")" $(TOUCH_FILE) "$(<[4]:W)" $(TOUCH_FILE) "$(<[5]:W)" }