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

From: kbelco_at_[hidden]
Date: 2008-04-23 21:40:32

Author: noel_belcourt
Date: 2008-04-23 21:40:31 EDT (Wed, 23 Apr 2008)
New Revision: 44746
URL: http://svn.boost.org/trac/boost/changeset/44746

Log:
Fixup patch to intel-darwin.jam so it looks and
reads a bit better.

Text files modified: 
   trunk/tools/build/v2/tools/intel-darwin.jam |    11 +++++++++--                             
   1 files changed, 9 insertions(+), 2 deletions(-)

Modified: trunk/tools/build/v2/tools/intel-darwin.jam
==============================================================================
--- trunk/tools/build/v2/tools/intel-darwin.jam	(original)
+++ trunk/tools/build/v2/tools/intel-darwin.jam	2008-04-23 21:40:31 EDT (Wed, 23 Apr 2008)
@@ -105,6 +105,13 @@
       flags intel-darwin.link OPTIONS $(condition)/<runtime-link>static : -static -static-intel -lstdc++ -lpthread ;
       flags intel-darwin.link OPTIONS $(condition)/<runtime-link>shared : -shared-intel -lstdc++ -lpthread ;
     }
+
+    local minor = [ MATCH ".*\\.(.).*" : $(version) ] ;
+
+    # wchar_t char_traits workaround for compilers older than 10.2
+    if $(major) = "9" || ( $(major) = "10" && ( $(minor) = "0" || $(minor) = "1" ) ) {
+        flags intel-darwin.compile DEFINES $(condition) : __WINT_TYPE__=int : unchecked ;
+    }
 }
 
 SPACE = " " ;
@@ -130,12 +137,12 @@
 
 actions compile.c
 {
-    "$(CONFIG_COMMAND)" -xc -D__WINT_TYPE__=int $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
+    "$(CONFIG_COMMAND)" -xc $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
 }
 
 actions compile.c++
 {
-    "$(CONFIG_COMMAND)" -xc++ -D__WINT_TYPE__=int $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
+    "$(CONFIG_COMMAND)" -xc++ $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -c -o "$(<)" "$(>)"
 }
 
 flags intel-darwin ARFLAGS <archiveflags> ;