llvm/compiler-rt.nix: add i{4,5,6}86 to X86 architecture

[matthewbauer]

Fixes #85622

Motivation for this change

Things done

• Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
• Built on platform(s)
  • NixOS
  • macOS
  • other Linux distributions
• Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
• Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
• Tested execution of all binary files (usually in ./result/bin/)
• Determined the impact on package closure size (by running nix path-info -S before and after)
• Ensured that relevant documentation is up to date
• Fits CONTRIBUTING.md.

[Ericson2314]

Let's try to upstream this.

[risicle]

Seems to resolve things for me.

[ggreif]

This seems to break build on macOS:

-- Checking DARWIN_macosx_SYSROOT - ''
-- Checking DARWIN_iphonesimulator_SYSROOT - ''
-- Checking DARWIN_iphoneos_SYSROOT - ''
-- Checking DARWIN_watchsimulator_SYSROOT - ''
-- Checking DARWIN_watchos_SYSROOT - ''
-- Checking DARWIN_appletvsimulator_SYSROOT - ''
-- Checking DARWIN_appletvos_SYSROOT - ''
-- OSX supported builtin arches: i386;i486;i586;i686;x86_64;x86_64h
-- Builtin supported architectures: i386;i486;i586;i686;x86_64;x86_64h
-- Performing Test COMPILER_RT_TARGET_HAS_ATOMICS
-- Performing Test COMPILER_RT_TARGET_HAS_ATOMICS - Success
-- Performing Test COMPILER_RT_TARGET_HAS_FCNTL_LCK
-- Performing Test COMPILER_RT_TARGET_HAS_FCNTL_LCK - Success
-- Performing Test COMPILER_RT_TARGET_HAS_UNAME
-- Performing Test COMPILER_RT_TARGET_HAS_UNAME - Success
-- Performing Test HAS_THREAD_LOCAL
-- Performing Test HAS_THREAD_LOCAL - Success
-- Configuring done
CMake Error at cmake/Modules/CompilerRTDarwinUtils.cmake:205 (add_library):
  No SOURCES given to target: clang_rt.builtins_i586_osx
Call Stack (most recent call first):
  cmake/Modules/CompilerRTDarwinUtils.cmake:303 (darwin_add_builtin_library)
  lib/builtins/CMakeLists.txt:570 (darwin_add_builtin_libraries)


CMake Error at cmake/Modules/CompilerRTDarwinUtils.cmake:205 (add_library):
  No SOURCES given to target: clang_rt.builtins_i486_osx
Call Stack (most recent call first):
  cmake/Modules/CompilerRTDarwinUtils.cmake:303 (darwin_add_builtin_library)
  lib/builtins/CMakeLists.txt:570 (darwin_add_builtin_libraries)


CMake Generate step failed.  Build files cannot be regenerated correctly.
builder for '/nix/store/nmw0nam3j7dijkyy67q56n7wwv2hcqbw-compiler-rt-10.0.0.drv' failed with exit code 1
error: build of '/nix/store/nmw0nam3j7dijkyy67q56n7wwv2hcqbw-compiler-rt-10.0.0.drv' failed

when doing nix-build -A pkgs.llvmPackages_10.compiler-rt.

This seems to help:

index c0ea436ae27..b5a1cc95a38 100644
--- a/pkgs/development/compilers/llvm/10/compiler-rt.nix
+++ b/pkgs/development/compilers/llvm/10/compiler-rt.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
   # 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 = ''
+  postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) ''
     substituteInPlace cmake/builtin-config-ix.cmake \
       --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)'
   '' + stdenv.lib.optionalString stdenv.isDarwin ''

[risicle]

I can confirm, same error macos 10.14 :(

[ggreif]

@risicle can you check the patch I pasted above?

See #87528.

[risicle]

@ggreif indeed it does 👍