Revert "Add mingwW64-llvm cross-system."

2 files changed, 0 insertions, 38 deletions

diff --git a/pkgs/build-support/bintools-wrapper/add-lld-ldflags-before.sh b/pkgs/build-support/bintools-wrapper/add-lld-ldflags-before.sh
deleted file mode 100644
index 265339eb185..00000000000
--- a/pkgs/build-support/bintools-wrapper/add-lld-ldflags-before.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# ld.lld has two incompatible command-line drivers: One for the gnu-compatible COFF linker and one for
-# the ELF linker. If no emulation is set (with -m), it will default to the ELF linker;
-# unfortunately, some configure scripts use `ld --help` to check for certain Windows-specific flags,
-# which don't show up in the help for the ELF linker. So we set a default -m here.
-
-extraBefore+=("-m" "@mtype@")
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index e4fb3c6d6a6..4c2a13da015 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -31,13 +31,6 @@
 
 # Darwin code signing support utilities
 , postLinkSignHook ? null, signingUtils ? null
-
-# Linker type
-, isLld ? bintools.isLld or false
-, isCctools ? bintools.isCctools or false
-, isGNU ? bintools.isGNU or false
-, isGold ? bintools.isGold or false
-, isBfd ? bintools.isBfd or false
 }:
 
 with lib;
@@ -120,8 +113,6 @@ stdenv.mkDerivation {
   passthru = {
     inherit bintools libc nativeTools nativeLibc nativePrefix;
 
-    inherit isLld isCctools isGNU isGold isBfd;
-
     emacsBufferSetup = pkgs: ''
       ; We should handle propagation here too
       (mapc
@@ -302,11 +293,6 @@ stdenv.mkDerivation {
       echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/libc-ldflags
     ''
 
-    # lld's MinGW driver (e.g. `ld.lld -m i386pep`) does not support the `-z` flag.
-    + optionalString (targetPlatform.isWindows && isLld) ''
-      hardening_unsupported_flags+=" relro bindnow"
-    ''
-
     ##
     ## GNU specific extra strip flags
     ##
@@ -352,24 +338,6 @@ stdenv.mkDerivation {
     )
 
     ##
-    ## Set the default machine type so that $prefix-ld.lld uses the COFF driver for --help
-    ##
-    ## Needed because autotools parses --help for linker features...
-    ##
-    + optionalString (isLld && stdenv.targetPlatform.isWindows) (let
-      mtype =
-        /**/ if targetPlatform.isx86_32 then "i386pe"
-        else if targetPlatform.isx86_64 then "i386pep"
-        else if targetPlatform.isAarch32 then "thumb2pe"
-        else if targetPlatform.isAarch64 then "arm64pe"
-        else throw "unsupported target arch for lld";
-    in ''
-      export mtype=${mtype}
-      substituteAll ${./add-lld-ldflags-before.sh} add-local-ldflags-before.sh
-      cat add-local-ldflags-before.sh >> $out/nix-support/add-local-ldflags-before.sh
-    '')
-
-    ##
     ## Code signing on Apple Silicon
     ##
     + optionalString (targetPlatform.isDarwin && targetPlatform.isAarch64) ''