Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r68824 - trunk/tools/build/v2/tools
From: blelbach_at_[hidden]
Date: 2011-02-13 02:01:01


Author: wash
Date: 2011-02-13 02:00:59 EST (Sun, 13 Feb 2011)
New Revision: 68824
URL: http://svn.boost.org/trac/boost/changeset/68824

Log:
Fix PCH support for the clang-linux toolset.

Text files modified:
   trunk/tools/build/v2/tools/clang-linux.jam | 9 +++++----
   1 files changed, 5 insertions(+), 4 deletions(-)

Modified: trunk/tools/build/v2/tools/clang-linux.jam
==============================================================================
--- trunk/tools/build/v2/tools/clang-linux.jam (original)
+++ trunk/tools/build/v2/tools/clang-linux.jam 2011-02-13 02:00:59 EST (Sun, 13 Feb 2011)
@@ -1,4 +1,5 @@
 # Copyright (c) 2003 Michael Stevens
+# Copyright (c) 2011 Bryce Lelbach
 #
 # Use, modification and distribution is subject to the Boost Software
 # License Version 1.0. (See accompanying file LICENSE_1_0.txt or
@@ -98,7 +99,7 @@
 
 actions compile.c++ bind PCH_FILE
 {
- "$(CONFIG_COMMAND)" -c -x c++ $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -use-pch"$(PCH_FILE)" -c -o "$(<)" "$(>)"
+ "$(CONFIG_COMMAND)" -c -x c++ $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -include-pch -Xclang "$(PCH_FILE)" -c -o "$(<)" "$(>)"
 }
 
 rule compile.c ( targets * : sources * : properties * )
@@ -111,7 +112,7 @@
 
 actions compile.c bind PCH_FILE
 {
- "$(CONFIG_COMMAND)" -c -x c $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -use-pch"$(PCH_FILE)" -c -o "$(<)" "$(>)"
+ "$(CONFIG_COMMAND)" -c -x c $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -include-pch -Xclang "$(PCH_FILE)" -c -o "$(<)" "$(>)"
 }
 
 rule compile.c++.pch ( targets * : sources * : properties * )
@@ -127,7 +128,7 @@
 #
 actions compile.c++.pch
 {
- rm -f "$(<)" && "$(CONFIG_COMMAND)" -x c++-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -pch-create "$(<)" "$(>)"
+ rm -f "$(<)" && "$(CONFIG_COMMAND)" -x c++-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -emit-pch -o "$(<)" "$(>)"
 }
 
 rule compile.c.pch ( targets * : sources * : properties * )
@@ -139,7 +140,7 @@
 
 actions compile.c.pch
 {
- rm -f "$(<)" && "$(CONFIG_COMMAND)" -x c-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -pch-create "$(<)" "$(>)"
+ rm -f "$(<)" && "$(CONFIG_COMMAND)" -x c-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -emit-pch -o "$(<)" "$(>)"
 }
 
 rule link ( targets * : sources * : properties * )


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk