[Boost-commit] svn:boost r49522 - trunk/tools/build/v2/tools

Subject: [Boost-commit] svn:boost r49522 - trunk/tools/build/v2/tools
From: ghost_at_[hidden]
Date: 2008-11-01 13:24:41

Author: vladimir_prus
Date: 2008-11-01 13:24:41 EDT (Sat, 01 Nov 2008)
New Revision: 49522
URL: http://svn.boost.org/trac/boost/changeset/49522

Log:
Another attempt to get right extensions of PCH files on intel-win.

Text files modified: 
   trunk/tools/build/v2/tools/intel-win.jam |    15 +++++++++++----                         
   1 files changed, 11 insertions(+), 4 deletions(-)

Modified: trunk/tools/build/v2/tools/intel-win.jam
==============================================================================
--- trunk/tools/build/v2/tools/intel-win.jam	(original)
+++ trunk/tools/build/v2/tools/intel-win.jam	2008-11-01 13:24:41 EDT (Sat, 01 Nov 2008)
@@ -178,21 +178,28 @@
 # works.
 actions compile-c-c++-pch
 {
-    $(.CC) @"@($(<[1]:W).rsp:E="$(>[2]:W)" -Fo"$(<[2]:W)" -Yc"$(>[1]:D=)" -Fp"$(<[1]:W:S=pch)" $(CC_RSPLINE))" "@($(<[1]:W).cpp:E=#include $(.escaped-double-quote)$(>[1]:D=)$(.escaped-double-quote))" $(.CC.FILTER)
-    copy "$(<[1]:W:S=pch)i" "$(<[1]:W:S=pch)"
+    $(.CC) @"@($(<[1]:W).rsp:E="$(>[2]:W)" -Fo"$(<[2]:W)" -Yc"$(>[1]:D=)" -Fp"$(<[1]:S=.pch:W)" $(CC_RSPLINE))" "@($(<[1]:W).cpp:E=#include $(.escaped-double-quote)$(>[1]:D=)$(.escaped-double-quote))" $(.CC.FILTER)
 }
 
 actions compile-c-c++-pch-s
 {
-    $(.CC) @"@($(<[1]:W).rsp:E="$(>[2]:W)" -Fo"$(<[2]:W)" -Yc"$(>[1]:D=)" -Fp"$(<[1]:W:S=pch)" $(CC_RSPLINE))" $(.CC.FILTER)
-    copy "$(<[1]:W:S=pch)i" "$(<[1]:W:S=pch)"
+    $(.CC) @"@($(<[1]:W).rsp:E="$(>[2]:W)" -Fo"$(<[2]:W)" -Yc"$(>[1]:D=)" -Fp"$(<[1]:S=.pch:W)" $(CC_RSPLINE))" $(.CC.FILTER)
 }
 
+# We also need to mess with pch vs. pchi here.
+actions compile-c-c++
+{
+    $(.CC) @"@($(<[1]:W).rsp:E="$(>[1]:W)" -Fo"$(<[1]:W)" -Yu"$(>[3]:D=)" -Fp"$(>[2]:S=.pch:W)" $(CC_RSPLINE))" $(.CC.FILTER)
+}
+
+
 # The compile.c.pch rule that is actually called from the generator for PCH
 # is imported by toolset.inherit-rules, but it's not localized, so it will
 # use compile-c-c++-pch* defined in msvc. Re-import it localized.
 IMPORT msvc : compile.c.pch : intel-win : intel-win.compile.c.pch : localized ;
 IMPORT msvc : compile.c++.pch : intel-win : intel-win.compile.c++.pch : localized ;
+IMPORT msvc : compile.c : intel-win : intel-win.compile.c : localized ;
+IMPORT msvc : compile.c++ : intel-win : intel-win.compile.c++ : localized ;
 # This one is used by compile.c++.pch. Of course, this is a mess, but Python port
 # will clean this up.
 IMPORT msvc : get-rspline : intel-win : get-rspline ;