Ticket #5305: build_intel_win.patch
File build_intel_win.patch, 2.6 KB (added by , 11 years ago) |
---|
-
tools/intel-win.
old new 14 14 import toolset ; 15 15 import generators ; 16 16 import type ; 17 import path ; 17 18 18 19 feature.extend-subfeature toolset intel : platform : win ; 19 20 … … 44 45 local condition = [ common.check-init-parameters intel-win 45 46 : version $(version) : compatibility $(compatibility) ] ; 46 47 48 local m = [ MATCH ([0-9]+).* : $(version) ] ; 49 local major = $(m[1]) ; 50 47 51 command = [ common.get-invocation-command intel-win : icl.exe : 48 52 $(command) ] ; 49 53 … … 53 57 if $(command) 54 58 { 55 59 root = [ common.get-absolute-tool-path $(command[-1]) ] ; 60 if $(major) >= 12 61 { 62 root = [ path.parent $(root) ] ; 63 } 56 64 root = $(root)/ ; 57 65 } 58 66 … … 61 69 if ! $(setup) 62 70 { 63 71 setup = $(root)/iclvars.bat ; 72 setup = [ path.native $(setup) ] ; 73 } 74 local iclvars_addressmodel ; 75 local iclvars_vs_arg ; 76 if $(major) >= 12 77 { 78 iclvars_addressmodel = ia32 ; 79 if $(compatibility) = vc10 80 { 81 iclvars_vs_arg = vs2010 ; 82 } 64 83 } 65 setup = "call \""$(setup)"\" > nul " ; 84 else 85 { 86 iclvars_vs_arg = $(compatibility) ; 87 } 88 setup = "call \""$(setup)"\" $(iclvars_addressmodel) $(iclvars_vs_arg) > nul " ; 66 89 67 90 if [ os.name ] = NT 68 91 { … … 75 98 } 76 99 77 100 toolset.flags intel-win.compile .CC $(condition) : $(setup)icl ; 78 toolset.flags intel-win.link .LD $(condition) : $(setup)xilink ;79 toolset.flags intel-win.archive .LD $(condition) : $(setup)xilink /lib ;101 toolset.flags intel-win.link .LD $(condition) : $(setup)xilink /nologo ; 102 toolset.flags intel-win.archive .LD $(condition) : $(setup)xilink /lib /nologo ; 80 103 toolset.flags intel-win.link .MT $(condition) : $(setup)mt -nologo ; 81 104 toolset.flags intel-win.compile .MC $(condition) : $(setup)mc ; 82 105 toolset.flags intel-win.compile .RC $(condition) : $(setup)rc ; 83 106 84 local m = [ MATCH (.).* : $(version) ] ; 85 local major = $(m[1]) ; 107 86 108 87 109 local C++FLAGS ; 88 110 … … 96 118 97 119 # Disable Microsoft "secure" overloads in Dinkumware libraries since they 98 120 # cause compile errors with Intel versions 9 and 10. 121 if $(major) < 12 122 { 99 123 C++FLAGS += -D_SECURE_SCL=0 ; 124 } 100 125 101 126 if $(major) > 5 102 127 { … … 135 160 136 161 if $(compatibility) && $(compatibility) != native 137 162 { 138 C++FLAGS += /Q$( base-vc) ;163 C++FLAGS += /Q$(compatibility) ; 139 164 } 140 165 else 141 166 {