1diff --git a/src/build/toolset.jam b/src/build/toolset.jam 2index b5defd5..a942cd9 100644 3--- a/src/build/toolset.jam 4+++ b/src/build/toolset.jam 5@@ -17,6 +17,8 @@ import regex ; 6 import sequence ; 7 import set ; 8 import property-set ; 9+import order ; 10+import "class" : new ; 11 12 13 .flag-no = 1 ; 14@@ -237,6 +239,7 @@ rule handle-flag-value ( value * : properties * ) 15 if $(value:G) 16 { 17 local matches = [ property.select $(value) : $(properties) ] ; 18+ local order ; 19 for local p in $(matches) 20 { 21 local att = [ feature.attributes $(p:G) ] ; 22@@ -263,11 +266,24 @@ rule handle-flag-value ( value * : properties * ) 23 } 24 if path in $(att) 25 { 26- result += [ sequence.transform path.native : $(values) ] ; 27+ values = [ sequence.transform path.native : $(values) ] ; 28 } 29- else 30+ result += $(values) ; 31+ if $(values[2]) 32 { 33- result += $(values) ; 34+ if ! $(order) 35+ { 36+ order = [ new order ] ; 37+ } 38+ local prev ; 39+ for local v in $(values) 40+ { 41+ if $(prev) 42+ { 43+ $(order).add-pair $(prev) $(v) ; 44+ } 45+ prev = $(v) ; 46+ } 47 } 48 } 49 else 50@@ -275,6 +291,11 @@ rule handle-flag-value ( value * : properties * ) 51 result += $(p:G=) ; 52 } 53 } 54+ if $(order) 55+ { 56+ result = [ $(order).order [ sequence.unique $(result) : stable ] ] ; 57+ DELETE_MODULE $(order) ; 58+ } 59 } 60 else 61 { 62