From a2cb8653ef02f0e22669c4fbc2391c12eff38873 Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Thu, 18 May 2006 05:43:24 +0000
Subject: [PATCH] Merge from trunk

[SVN r33988]
---
 src/build/build-request.jam | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/build/build-request.jam b/src/build/build-request.jam
index 3fed9469f..82d39b022 100644
--- a/src/build/build-request.jam
+++ b/src/build/build-request.jam
@@ -125,9 +125,14 @@ rule from-command-line ( command-line * )
     local properties ;
 
     command-line = $(command-line[2-]) ;
+    local skip-next = ;
     for local e in $(command-line)
     {
-        if ! [ MATCH "^(-).*" : $(e) ] 
+        if $(skip-next)
+        {
+            skip-next = ;
+        }
+        else if ! [ MATCH "^(-).*" : $(e) ] 
         {
             # Build request spec either has "=" in it, or completely
             # consists of implicit feature values.
@@ -142,6 +147,10 @@ rule from-command-line ( command-line * )
                 targets += $(e) ;
             }
         }
+        else if [ MATCH "^(-[-ldjfsto])$" : $(e) ]
+        {
+            skip-next = true ;
+        }
     }
     return [ new vector [ new vector $(targets) ] [ new vector $(properties) ] ] ;
 }