From a9916f9b1a1a5ab598430a30c331ffe186af51e4 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Fri, 24 Nov 2017 15:12:43 +0100 Subject: [PATCH] build/jam/BuildFeatureRules: Make EnableBuildFeatures actually work. It was trying to use $(feature:U) outside of the loop where it is actually set. Thanks to PulkoMandy for spotting the problem. (How did this not break tons of stuff?) --- build/jam/BuildFeatureRules | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/jam/BuildFeatureRules b/build/jam/BuildFeatureRules index 49f2c5bd0a..62d5545da4 100644 --- a/build/jam/BuildFeatureRules +++ b/build/jam/BuildFeatureRules @@ -155,11 +155,11 @@ rule EnableBuildFeatures features : specification features = [ FQualifiedBuildFeatureName $(features) ] ; - if ! $(HAIKU_BUILD_FEATURE_$(feature:U)_ENABLED) - && ( ! $(specification) - || [ FMatchesBuildFeatures $(specification) ] ) { - local feature ; - for feature in $(features) { + local feature ; + for feature in $(features) { + if ! $(HAIKU_BUILD_FEATURE_$(feature:U)_ENABLED) + && ( ! $(specification) + || [ FMatchesBuildFeatures $(specification) ] ) { HAIKU_BUILD_FEATURES += $(feature) ; HAIKU_BUILD_FEATURE_$(feature:U)_ENABLED = 1 ; }