Merge remote-tracking branch 'origin/master' into hardened-stdenv
This commit is contained in:
@@ -17,7 +17,11 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
buildInputs = [ cmake libpfm zlib python pkgconfig pythonPackages.pexpect which procps gdb ];
|
||||
cmakeFlags = "-DCMAKE_C_FLAGS_RELEASE:STRING= -DCMAKE_CXX_FLAGS_RELEASE:STRING=";
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_C_FLAGS_RELEASE:STRING="
|
||||
"-DCMAKE_CXX_FLAGS_RELEASE:STRING="
|
||||
"-Ddisable32bit=ON"
|
||||
];
|
||||
|
||||
# we turn on additional warnings due to hardening
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error";
|
||||
|
||||
Reference in New Issue
Block a user