diff options
| author | Kyle Copperfield <kmcopper@danwin1210.me> | 2019-11-19 14:48:42 +0000 |
|---|---|---|
| committer | Kyle Copperfield <kmcopper@danwin1210.me> | 2019-11-19 16:10:39 +0000 |
| commit | 19adae30c1273843d879a8f5d140597850e02989 (patch) | |
| tree | ee9b50cd5d2fca37f18fe21ce23d752876892a81 /pkgs | |
| parent | 5f8b0d7d99b4788235cb2379a5829a74f8e7d4d4 (diff) | |
| download | nixpkgs-19adae30c1273843d879a8f5d140597850e02989.tar nixpkgs-19adae30c1273843d879a8f5d140597850e02989.tar.gz nixpkgs-19adae30c1273843d879a8f5d140597850e02989.tar.bz2 nixpkgs-19adae30c1273843d879a8f5d140597850e02989.tar.lz nixpkgs-19adae30c1273843d879a8f5d140597850e02989.tar.xz nixpkgs-19adae30c1273843d879a8f5d140597850e02989.tar.zst nixpkgs-19adae30c1273843d879a8f5d140597850e02989.zip | |
llvm/compiler-rt: default to compatible scudo options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/llvm/7/compiler-rt.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/8/compiler-rt.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/9/compiler-rt.nix | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix index 5d7266f39ec..a7d4bcb8696 100644 --- a/pkgs/development/compilers/llvm/7/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix @@ -7,6 +7,10 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake python llvm ]; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; + NIX_CFLAGS_COMPILE = [ + "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" + ]; + cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false || stdenv.isDarwin) [ "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" diff --git a/pkgs/development/compilers/llvm/8/compiler-rt.nix b/pkgs/development/compilers/llvm/8/compiler-rt.nix index 88788852862..344ff725675 100644 --- a/pkgs/development/compilers/llvm/8/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/8/compiler-rt.nix @@ -7,6 +7,10 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake python llvm ]; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; + NIX_CFLAGS_COMPILE = [ + "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" + ]; + cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [ "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" diff --git a/pkgs/development/compilers/llvm/9/compiler-rt.nix b/pkgs/development/compilers/llvm/9/compiler-rt.nix index 9a333ad7c11..5826f0fbb35 100644 --- a/pkgs/development/compilers/llvm/9/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/9/compiler-rt.nix @@ -7,6 +7,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python llvm ]; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; + NIX_CFLAGS_COMPILE = [ + "-DSCUDO_DEFAULT_OPTIONS=DeleteSizeMismatch=0:DeallocationTypeMismatch=0" + ]; + cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [ "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON" "-DCMAKE_C_COMPILER_TARGET=${stdenv.hostPlatform.config}" |