[Boost-commit] svn:boost r61007 - in trunk: boost/config/abi tools/build/v2/tools

Subject: [Boost-commit] svn:boost r61007 - in trunk: boost/config/abi tools/build/v2/tools
From: David.Dean_at_[hidden]
Date: 2010-04-02 14:35:01

Author: siliconman
Date: 2010-04-02 14:35:00 EDT (Fri, 02 Apr 2010)
New Revision: 61007
URL: http://svn.boost.org/trac/boost/changeset/61007

Log:
make abi/borland_prefix and borland.jam defaults match
Text files modified: 
   trunk/boost/config/abi/borland_prefix.hpp |     2 +-                                      
   trunk/tools/build/v2/tools/borland.jam    |    33 +++++++++++++++++++++------------       
   2 files changed, 22 insertions(+), 13 deletions(-)

Modified: trunk/boost/config/abi/borland_prefix.hpp
==============================================================================
--- trunk/boost/config/abi/borland_prefix.hpp	(original)
+++ trunk/boost/config/abi/borland_prefix.hpp	2010-04-02 14:35:00 EDT (Fri, 02 Apr 2010)
@@ -21,7 +21,7 @@
 //  8026 - functions taking class by value arguments are not expanded inline
 
 #pragma nopushoptwarn
-#  pragma option push -Vx -Ve -a8 -b -pc -Vmv -VC- -Vl- -w-8027 -w-8026
+#  pragma option push -a8 -Vx- -Ve- -b- -pc -Vmv -VC- -Vl- -w-8027 -w-8026
 
 
 

Modified: trunk/tools/build/v2/tools/borland.jam
==============================================================================
--- trunk/tools/build/v2/tools/borland.jam	(original)
+++ trunk/tools/build/v2/tools/borland.jam	2010-04-02 14:35:00 EDT (Fri, 02 Apr 2010)
@@ -80,18 +80,27 @@
 # Deal with various runtime configs...
 
 # This should be not for DLL
-flags borland OPTIONS <user-interface>console : -tWC ;
+local target = [ feature.get-values target-os : $(properties) ] ;
 
-# -tWR sets -tW as well, so we turn it off here and then turn it 
-# on again later if we need it:
-flags borland OPTIONS <runtime-link>shared : -tWR -tWC ;
-flags borland OPTIONS <user-interface>gui : -tW ;
-
-flags borland OPTIONS <main-target-type>LIB/<link>shared : -tWD ;
-# Hmm.. not sure what's going on here.
-flags borland OPTIONS : -WM- ;
-flags borland OPTIONS <threading>multi : -tWM ;
+flags borland OPTIONS <user-interface>console : -tC ;
 
+switch $(target)
+{
+    case windows :
+    {
+        # -tWR sets -tW as well, so we turn it off here and then turn it 
+        # on again later if we need it:
+        flags borland OPTIONS <runtime-link>shared : -tWR -tWC ;
+        flags borland OPTIONS <user-interface>gui : -tW ;
+        flags borland OPTIONS <main-target-type>LIB/<link>shared : -tWD ;
+        # Hmm.. not sure what's going on here.
+        flags borland OPTIONS : -WM- ;
+        flags borland OPTIONS <threading>multi : -tWM ;
+    }
+    case darwin :
+    {
+    }
+}
 
 
 flags borland.compile OPTIONS <cxxflags> ;
@@ -117,13 +126,13 @@
 
 actions compile.c++
 {
-    "$(CONFIG_COMMAND)" -j5 -g255 -q -c -P -a8 -b- $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -I"$(STDHDRS)" -o"$(<)" "$(>)"
+    "$(CONFIG_COMMAND)" -j5 -g255 -q -c -P -a8 -Vx- -Ve- -b- $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -I"$(STDHDRS)" -o"$(<)" "$(>)"
 }
 
 # For C, we don't pass -P flag
 actions compile.c
 {
-    "$(CONFIG_COMMAND)" -j5 -g255 -q -c -a8 -b- $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -I"$(STDHDRS)" -o"$(<)" "$(>)"
+    "$(CONFIG_COMMAND)" -j5 -g255 -q -c -a8 -Vx- -Ve- -b- $(OPTIONS) -D$(DEFINES) -I"$(INCLUDES)" -I"$(STDHDRS)" -o"$(<)" "$(>)"
 }