mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-10 16:26:18 +02:00
2cd468874f
Because config.h can #define things like _FILE_OFFSET_BITS=64 and not
every compilation unit includes config.h, we currently compile half of
Nix with _FILE_OFFSET_BITS=64 and other half with _FILE_OFFSET_BITS
unset. This causes major havoc with the Settings class on e.g. 32-bit ARM,
where different compilation units disagree with the struct layout.
E.g.:
diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc
@@ -166,6 +166,8 @@ void Settings::update()
_get(useSubstitutes, "build-use-substitutes");
+ fprintf(stderr, "at Settings::update(): &useSubstitutes = %p\n", &nix::settings.useSubstitutes);
_get(buildUsersGroup, "build-users-group");
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -138,6 +138,8 @@ void RemoteStore::initConnection(Connection & conn)
void RemoteStore::setOptions(Connection & conn)
{
+ fprintf(stderr, "at RemoteStore::setOptions(): &useSubstitutes = %p\n", &nix::settings.useSubstitutes);
conn.to << wopSetOptions
Gave me:
at Settings::update(): &useSubstitutes = 0xb6e5c5cb
at RemoteStore::setOptions(): &useSubstitutes = 0xb6e5c5c7
That was not a fun one to debug!
|
||
|---|---|---|
| .. | ||
| affinity.cc | ||
| affinity.hh | ||
| archive.cc | ||
| archive.hh | ||
| args.cc | ||
| args.hh | ||
| compression.cc | ||
| compression.hh | ||
| finally.hh | ||
| hash.cc | ||
| hash.hh | ||
| json.cc | ||
| json.hh | ||
| local.mk | ||
| logging.cc | ||
| logging.hh | ||
| lru-cache.hh | ||
| monitor-fd.hh | ||
| pool.hh | ||
| ref.hh | ||
| serialise.cc | ||
| serialise.hh | ||
| sync.hh | ||
| thread-pool.cc | ||
| thread-pool.hh | ||
| types.hh | ||
| util.cc | ||
| util.hh | ||
| xml-writer.cc | ||
| xml-writer.hh | ||