puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Narrower scope for nativeSystem

Browse source 
I don't think we need a CPP defininition and a header entry, and this
way allows constant expression elimination.
This commit is contained in:
John Ericson 2023-11-05 12:17:33 -05:00
parent 8e222fbb12
commit 2678b51b31
3 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/build/local-derivation-goal.cc
View file

@ -1620,6 +1620,8 @@ void setupSeccomp()
seccomp_release(ctx); seccomp_release(ctx);
}); });
constexpr std::string_view nativeSystem = SYSTEM;
if (nativeSystem == "x86_64-linux" && if (nativeSystem == "x86_64-linux" &&
seccomp_arch_add(ctx, SCMP_ARCH_X86) != 0) seccomp_arch_add(ctx, SCMP_ARCH_X86) != 0)
throw SysError("unable to add 32-bit seccomp architecture"); throw SysError("unable to add 32-bit seccomp architecture");

2
src/libutil/error.cc
View file

@ -7,8 +7,6 @@
namespace nix { namespace nix {
const std::string nativeSystem = SYSTEM;
void BaseError::addTrace(std::shared_ptr<AbstractPos> && e, hintformat hint, bool frame) void BaseError::addTrace(std::shared_ptr<AbstractPos> && e, hintformat hint, bool frame)
{ {
err.traces.push_front(Trace { .pos = std::move(e), .hint = hint, .frame = frame }); err.traces.push_front(Trace { .pos = std::move(e), .hint = hint, .frame = frame });

6
src/libutil/util.hh
View file

@ -34,12 +34,6 @@ struct Source;
void initLibUtil(); void initLibUtil();
/**
* The system for which Nix is compiled.
*/
extern const std::string nativeSystem;
/** /**
* @return an environment variable. * @return an environment variable.
*/ */