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

Subject: [Boost-commit] svn:boost r68845 - trunk/tools/build/v2/tools
From: blelbach_at_[hidden]
Date: 2011-02-13 10:57:22

Author: wash
Date: 2011-02-13 10:57:21 EST (Sun, 13 Feb 2011)
New Revision: 68845
URL: http://svn.boost.org/trac/boost/changeset/68845

Log:
Disable PCH support on clang-linux until we can come up with a better solution
for it.

Text files modified: 
   trunk/tools/build/v2/tools/clang-linux.jam |   114 +++++++++++++++++++++------------------ 
   1 files changed, 60 insertions(+), 54 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 10:57:21 EST (Sun, 13 Feb 2011)
@@ -20,16 +20,18 @@
 feature.extend-subfeature toolset clang : platform : linux ;
 
 toolset.inherit-generators clang-linux 
-     <toolset>clang <toolset-clang:platform>linux : gcc : gcc.mingw.link gcc.mingw.link.dll gcc.cygwin.link gcc.cygwin.link.dll ;
+     <toolset>clang <toolset-clang:platform>linux : gcc
+    : gcc.mingw.link gcc.mingw.link.dll gcc.cygwin.link gcc.cygwin.link.dll gcc.compile.c.pch gcc.compile.c++.pch ;
 generators.override clang-linux.prebuilt : builtin.lib-generator ;
 generators.override clang-linux.prebuilt : builtin.prebuilt ;
 generators.override clang-linux.searched-lib-generator : searched-lib-generator ;
 
 # Override default do-nothing generators.
-generators.override clang-linux.compile.c.pch   : pch.default-c-pch-generator   ;
-generators.override clang-linux.compile.c++.pch : pch.default-cpp-pch-generator ;
+# FIXME: disabled for now
+#generators.override clang-linux.compile.c.pch   : pch.default-c-pch-generator   ;
+#generators.override clang-linux.compile.c++.pch : pch.default-cpp-pch-generator ;
  
-type.set-generated-target-suffix PCH : <toolset>clang <toolset-clang:platform>linux : pchi ;
+#type.set-generated-target-suffix PCH : <toolset>clang <toolset-clang:platform>linux : pchc ;
 
 toolset.inherit-rules clang-linux : gcc ;
 toolset.inherit-flags clang-linux : gcc 
@@ -89,59 +91,63 @@
 toolset.flags clang-linux.compile OPTIONS <profiling>on : ;
 toolset.flags clang-linux.compile OPTIONS <rtti>off : -fno-rtti ;
 
-rule compile.c++ ( targets * : sources * : properties * )
-{
-    gcc.setup-threading $(targets) : $(sources) : $(properties) ;
-    gcc.setup-fpic $(targets) : $(sources) : $(properties) ;
-    gcc.setup-address-model $(targets) : $(sources) : $(properties) ;
-    DEPENDS $(<) : [ on $(<) return $(PCH_FILE) ] ;
-}
-
-actions compile.c++ bind PCH_FILE
-{
-    "$(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 * )
-{
-    gcc.setup-threading $(targets) : $(sources) : $(properties) ;
-    gcc.setup-fpic $(targets) : $(sources) : $(properties) ;
-    gcc.setup-address-model $(targets) : $(sources) : $(properties) ;    
-    DEPENDS $(<) : [ on $(<) return $(PCH_FILE) ] ;
-}
-
-actions compile.c bind PCH_FILE
-{
-    "$(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 * )
+#{
+#    gcc.setup-threading $(targets) : $(sources) : $(properties) ;
+#    gcc.setup-fpic $(targets) : $(sources) : $(properties) ;
+#    gcc.setup-address-model $(targets) : $(sources) : $(properties) ;
+#    DEPENDS $(<) : [ on $(<) return $(PCH_FILE) ] ;
+#}
+
+#actions compile.c++ bind PCH_FILE
+actions compile.c++ 
+{
+#    "$(CONFIG_COMMAND)" -c -x c++ $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -include-pch -Xclang "$(PCH_FILE)" -c -o "$(<)" "$(>)"
+    "$(CONFIG_COMMAND)" -c -x c++ $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
+}
+
+#rule compile.c ( targets * : sources * : properties * )
+#{
+#    gcc.setup-threading $(targets) : $(sources) : $(properties) ;
+#    gcc.setup-fpic $(targets) : $(sources) : $(properties) ;
+#    gcc.setup-address-model $(targets) : $(sources) : $(properties) ;    
+#    DEPENDS $(<) : [ on $(<) return $(PCH_FILE) ] ;
+#}
+
+#actions compile.c bind PCH_FILE
+actions compile.c 
+{
+#    "$(CONFIG_COMMAND)" -c -x c $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -include-pch -Xclang "$(PCH_FILE)" -c -o "$(<)" "$(>)"
+    "$(CONFIG_COMMAND)" -c -x c $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
+}
+
+#rule compile.c++.pch ( targets * : sources * : properties * )
+#{
+#    gcc.setup-threading $(targets) : $(sources) : $(properties) ;
+#    gcc.setup-fpic $(targets) : $(sources) : $(properties) ;
+#    gcc.setup-address-model $(targets) : $(sources) : $(properties) ;    
+#}
 
-rule compile.c++.pch ( targets * : sources * : properties * )
-{
-    gcc.setup-threading $(targets) : $(sources) : $(properties) ;
-    gcc.setup-fpic $(targets) : $(sources) : $(properties) ;
-    gcc.setup-address-model $(targets) : $(sources) : $(properties) ;    
-}
-#
-# Compiling a pch first deletes any existing *.pchi file, as Clang's compiler
-# won't over-write an existing pch: instead it creates filename$1.pchi, filename$2.pchi
+# Compiling a pch first deletes any existing *.pchc file, as Clang's compiler
+# won't over-write an existing pch: instead it creates filename$1.pchc, filename$2.pchc
 # etc - which appear not to do anything except take up disk space :-(
-#
-actions compile.c++.pch
-{
-    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 * )
-{
-    gcc.setup-threading $(targets) : $(sources) : $(properties) ;
-    gcc.setup-fpic $(targets) : $(sources) : $(properties) ;
-    gcc.setup-address-model $(targets) : $(sources) : $(properties) ;    
-}
-
-actions compile.c.pch
-{
-    rm -f "$(<)" && "$(CONFIG_COMMAND)" -x c-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -emit-pch -o "$(<)" "$(>)"
-}
+#actions compile.c++.pch
+#{
+#    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 * )
+#{
+#    gcc.setup-threading $(targets) : $(sources) : $(properties) ;
+#    gcc.setup-fpic $(targets) : $(sources) : $(properties) ;
+#    gcc.setup-address-model $(targets) : $(sources) : $(properties) ;    
+#}
+
+#actions compile.c.pch
+#{
+#    rm -f "$(<)" && "$(CONFIG_COMMAND)" -x c-header $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -Xclang -emit-pch -o "$(<)" "$(>)"
+#}
 
 rule link ( targets * : sources * : properties * )
 {