Ticket #6997: gcc.jam.patch
File gcc.jam.patch, 2.2 KB (added by , 10 years ago) |
---|
-
(a) boost_1_49_0b/tools/build/v2/tools/gcc.jam vs. (b) gcc.jam.patch
a b 61 61 # The compiler command to use is detected in a three step manner: 62 62 # 1) If an explicit command is specified by the user, it will be used and must available. 63 63 # 2) If only a certain version is specified, it is enforced: 64 # - either a command 'g++ -VERSION' must be available64 # - either a command 'g++VERSION' must be available 65 65 # - or the default command 'g++' must be available and match the exact version. 66 66 # 3) Without user-provided restrictions use default 'g++' 67 67 rule init ( version ? : command * : options * ) … … 81 81 #2): enforce user-provided version 82 82 else if $(version) 83 83 { 84 tool-command = [ common.get-invocation-command-nodefault gcc : "g++ -$(version[1])" ] ;84 tool-command = [ common.get-invocation-command-nodefault gcc : "g++$(version[1])" ] ; 85 85 86 86 #2.1) fallback: check whether "g++" reports the requested version 87 87 if ! $(tool-command) … … 103 103 if $(stripped) != $(version) 104 104 { 105 105 errors.error "toolset gcc initialization:" : 106 "version '$(version)' requested but 'g++ -$(version)' not found and version '$(tool-version)' of default '$(tool-command)' does not match" :106 "version '$(version)' requested but 'g++$(version)' not found and version '$(tool-version)' of default '$(tool-command)' does not match" : 107 107 "initialized from" [ errors.nearest-user-location ] ; 108 108 tool-command = ; 109 109 } … … 114 114 else 115 115 { 116 116 errors.error "toolset gcc initialization:" : 117 "version '$(version)' requested but neither 'g++ -$(version)' nor default 'g++' found" :117 "version '$(version)' requested but neither 'g++$(version)' nor default 'g++' found" : 118 118 "initialized from" [ errors.nearest-user-location ] ; 119 119 } 120 120 }