From d82b78bf51b2d8f626264fa992a907dd1088389a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 7 Feb 2020 13:01:48 +0100
Subject: [PATCH] Fix segfault in gcc on i686-linux
src/libstore/ssh-store.cc: In constructor 'nix::SSHStore::SSHStore(const string&, const Params&)':
src/libstore/ssh-store.cc:31:21: internal compiler error: Segmentation fault
compress)
^
Please submit a full bug report,
with preprocessed source if appropriate.
https://hydra.nixos.org/build/111545609
---
src/libstore/ssh-store.cc | 4 ++--
src/libstore/store-api.hh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/libstore/ssh-store.cc b/src/libstore/ssh-store.cc
index af99ad40a..caae6b596 100644
--- a/src/libstore/ssh-store.cc
+++ b/src/libstore/ssh-store.cc
@@ -16,8 +16,8 @@ public:
const Setting<Path> sshKey{(Store*) this, "", "ssh-key", "path to an SSH private key"};
const Setting<bool> compress{(Store*) this, false, "compress", "whether to compress the connection"};
- const Setting<Path> remoteProgram{this, "nix-daemon", "remote-program", "path to the nix-daemon executable on the remote system"};
- const Setting<std::string> remoteStore{this, "", "remote-store", "URI of the store on the remote system"};
+ const Setting<Path> remoteProgram{(Store*) this, "nix-daemon", "remote-program", "path to the nix-daemon executable on the remote system"};
+ const Setting<std::string> remoteStore{(Store*) this, "", "remote-store", "URI of the store on the remote system"};
SSHStore(const std::string & host, const Params & params)
: Store(params)
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh
index 743be9410..861b96930 100644
--- a/src/libstore/store-api.hh
+++ b/src/libstore/store-api.hh
@@ -676,7 +676,7 @@ class LocalFSStore : public virtual Store
public:
// FIXME: the (Store*) cast works around a bug in gcc that causes
- // it to emit the call to the Option constructor. Clang works fine
+ // it to omit the call to the Setting constructor. Clang works fine
// either way.
const PathSetting rootDir{(Store*) this, true, "",
"root", "directory prefixed to all other paths"};