Merge: Emit clear error when using --layout=system with --build-type=complete.

[SVN r55734]

1 files changed, 11 insertions, 0 deletions

diff --git a/Jamroot b/Jamroot
index e88c986b18..eb1d840204 100644
--- a/Jamroot
+++ b/Jamroot
@@ -295,6 +295,17 @@ if ! $(layout)
 }
 layout-$(layout) = true ;
 
+if $(layout) = system && $(build-type) = complete
+{
+    ECHO "error: Cannot use --layout=system with --build-type complete." ;
+    ECHO "error: Please used either --layout=versioned or --layout=tagged " ;
+    ECHO "error: if you wish to build multiple variants." ;
+    if ! [ modules.peek : NT ] 
+    {        
+        ECHO "error: Note that --layout=system is default on Unix starting with Boost 1.40." ;
+    }    
+    EXIT ;
+}
 
 # Possible stage only location.
 local stage-locate = [ MATCH "^--stagedir=(.*)" : [ modules.peek : ARGV ] ] ;