Просмотр исходного кода

revert names of conditional features for deduction

The old names were referenced in Boost libraries and it's easier to
return to old names than fixing every reference.
Dmitry Arkhipov 2 лет назад
Родитель
Сommit
41460901ad
1 измененных файлов с 8 добавлено и 2 удалено
  1. 8 2
      boostcpp.jam

+ 8 - 2
boostcpp.jam

@@ -616,7 +616,7 @@ for a in $(.deducible-architectures)
     feature.compose <x-deduced-platform>$(a)_64 : <architecture>$(a) <address-model>64 ;
     feature.compose <x-deduced-platform>$(a)_64 : <architecture>$(a) <address-model>64 ;
 }
 }
 
 
-rule deduce-platform ( properties * )
+rule deduce-architecture ( properties * )
 {
 {
     local deduced-pl = [ property.select <x-deduced-platform> : $(properties) ] ;
     local deduced-pl = [ property.select <x-deduced-platform> : $(properties) ] ;
     if $(deduced-pl)
     if $(deduced-pl)
@@ -669,7 +669,13 @@ rule deduce-platform ( properties * )
 }
 }
 
 
 
 
+rule deduce-address-model ( properties * )
+{
+    # this rule is a noop and exists for legacy reasons
+}
+
 rule platform ( )
 rule platform ( )
 {
 {
-    return <conditional>@boostcpp.deduce-platform ;
+    return <conditional>@boostcpp.deduce-architecture
+        <conditional>@boostcpp.deduce-address-model ;
 }
 }

粤ICP备19079148号