diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-03-08T00·24+0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-03-08T00·24+0100 |
commit | bdd4646338da296fdf3a8f9dc3cf5aff1dafa163 (patch) | |
tree | 8bda49fe3eaef361a025c0f3b64ea51ea7728cbe /src/libexpr/eval.cc | |
parent | e73d9e948887621906363a35c980538294898a02 (diff) |
Revert "Prevent config.h from being clobbered"
This reverts commit 28bba8c44f484eae38e8a15dcec73cfa999156f6.
Diffstat (limited to 'src/libexpr/eval.cc')
-rw-r--r-- | src/libexpr/eval.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index 676dd3ac461a..a1613a4205b4 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -966,7 +966,7 @@ void ExprConcatStrings::eval(EvalState & state, Env & env, Value & v) since paths are copied when they are used in a derivation), and none of the strings are allowed to have contexts. */ if (first) { - isPath = vStr.type == tPath; + isPath = !forceString && vStr.type == tPath; first = false; } |