boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-15 00:52:16 +00:00
Code Issues Projects Releases Wiki Activity

Properly generated flag for intel/<compatibility>vc.

Browse Source 
* intel-win.jam (init): Strip 'vc' from the
	version passed to msvc.configure-verion-specific.
	* msvc.jam (configure-version-specific): Accept '6' and '7',
	not just 6.N and 7.N.


[SVN r35071]
This commit is contained in:
Vladimir Prus
2006-09-12 09:28:11 +00:00
parent a2b5a33a7c
commit b9df0155ea
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/tools/intel-win.jam
View File

@@ -7,6 +7,7 @@ import toolset ;
import feature ;
import toolset : flags ;
import os ;
import errors ;
# This is needed because the rule we import here depend on 'common'
# That's nasty.
@@ -137,10 +138,17 @@ rule init ( version ? : # the compiler version
if ! $(compatibility)
{
# If there's no backend version, assume 7.1.
compatibility = 7.1 ;
compatibility = vc7.1 ;
}
msvc.configure-version-specific intel-win : $(compatibility) : $(condition) ;
local extract-version = [ MATCH ^vc(.*) : $(compatibility) ] ;
if ! $(extract-version)
{
errors.user-error "Invalid value for compatibility option:"
$(compatibility) ;
}
msvc.configure-version-specific intel-win : $(extract-version[1]) : $(condition) ;
}
flags intel-win.link LIBRARY_OPTION <toolset>intel : "" ;

2
src/tools/msvc.jam
View File

@@ -415,7 +415,7 @@ rule configure-version-specific ( toolset : version : condition )
# Processor-specific optimization
#
if [ MATCH ^([67]\\.) : $(version) ]
if [ MATCH ^([67]) : $(version) ]
{
# 8.0 deprecates some of the options
flags $(toolset).compile CFLAGS $(condition)/<optimization>speed $(condition)/<optimization>space : /Ogiy /Gs ;