From 8e7d77d4944d7903f64dc8d61a43f81221cd4aea Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 23 Apr 2018 20:57:05 -0500 Subject: [PATCH] globals.hh: don't use '==' to compare string literals Saw this in logs, also reported here: https://github.com/NixOS/nix/commit/8e6108ff71caae180d764ab9e9bff5593724655c#r28707288 --- src/libstore/globals.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh index 0ae69242a..9360096aa 100644 --- a/src/libstore/globals.hh +++ b/src/libstore/globals.hh @@ -296,7 +296,7 @@ public: "listed in 'trusted-public-keys'."}; Setting 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 "