about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2018-04-24T01·57-0500
committerWill Dietz <w@wdtz.org>2018-04-24T01·57-0500
commit8e7d77d4944d7903f64dc8d61a43f81221cd4aea (patch)
tree3c75d32046f24883c169ffa1dddc5b3ce38d4a64
parent8e6108ff71caae180d764ab9e9bff5593724655c (diff)
globals.hh: don't use '==' to compare string literals
Saw this in logs, also reported here:

https://github.com/NixOS/nix/commit/8e6108ff71caae180d764ab9e9bff5593724655c#r28707288
-rw-r--r--src/libstore/globals.hh2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh
index 0ae69242a59c..9360096aae8c 100644
--- a/src/libstore/globals.hh
+++ b/src/libstore/globals.hh
@@ -296,7 +296,7 @@ public:
         "listed in 'trusted-public-keys'."};
 
     Setting<StringSet> extraPlatforms{this,
-        SYSTEM == "x86_64-linux" ? StringSet{"i686-linux"} : StringSet{},
+        std::string{SYSTEM} == "x86_64-linux" ? StringSet{"i686-linux"} : StringSet{},
         "extra-platforms",
         "Additional platforms that can be built on the local system. "
         "These may be supported natively (e.g. armv7 on some aarch64 CPUs "