diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-04-24 10:22:21 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2020-04-24 10:22:21 -0500 |
| commit | ff642c5694881f5009232f85e956edeeb89e0f97 (patch) | |
| tree | 45f6f751972b983fb16e7ac80611a240eb43fdbd /pkgs/development/compilers/llvm/6 | |
| parent | 22a3bf9fb9edad917fb6cd1066d58b5e426ee975 (diff) | |
llvm/compiler-rt.nix: add i{4,5,6}86 to X86 architecture
Fixes #85622
Diffstat (limited to 'pkgs/development/compilers/llvm/6')
| -rw-r--r-- | pkgs/development/compilers/llvm/6/compiler-rt.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/compilers/llvm/6/compiler-rt.nix b/pkgs/development/compilers/llvm/6/compiler-rt.nix index 1bdba107d7dd..abb6796e3c78 100644 --- a/pkgs/development/compilers/llvm/6/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/6/compiler-rt.nix @@ -54,7 +54,10 @@ stdenv.mkDerivation { # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by # a flag and turn the flag off during the stdenv build. - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = '' + substituteInPlace cmake/builtin-config-ix.cmake \ + --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' + '' + stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' '' + stdenv.lib.optionalString (useLLVM) '' |