mirror of
https://github.com/NixOS/nix
synced 2025-06-30 03:23:16 +02:00
Fix segfault on i686-linux
https://hydra.nixos.org/build/107467517 Seems that on i686-linux, gcc and rustc disagree on how to return 1-word structs: gcc has the caller pass a pointer to the result, while rustc has the callee return the result in a register. Work around this by using a bare pointer.
This commit is contained in:
parent
dbc4f9d478
commit
949dc84894
2 changed files with 4 additions and 15 deletions
|
@ -81,17 +81,4 @@ struct CBox
|
|||
}
|
||||
};
|
||||
|
||||
// Grrr, this is only needed because 'extern "C"' functions don't
|
||||
// support non-POD return types (and CBox has a destructor so it's not
|
||||
// POD).
|
||||
template<typename T>
|
||||
struct CBox2
|
||||
{
|
||||
T * ptr;
|
||||
CBox<T> use()
|
||||
{
|
||||
return CBox(ptr);
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue