From 894f0c6ec8952f5074d48a373506524f75700012 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 11 May 2021 23:57:07 +0000
Subject: [PATCH] llvmPackages: Always put `libunwind` before `openmp`

This keeps the "main bootstrap" together.
---
 pkgs/development/compilers/llvm/10/default.nix | 3 +--
 pkgs/development/compilers/llvm/11/default.nix | 3 +--
 pkgs/development/compilers/llvm/12/default.nix | 1 -
 pkgs/development/compilers/llvm/8/default.nix  | 3 +--
 pkgs/development/compilers/llvm/9/default.nix  | 3 +--
 5 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix
index e2e78e16d797..b63caf151f3d 100644
--- a/pkgs/development/compilers/llvm/10/default.nix
+++ b/pkgs/development/compilers/llvm/10/default.nix
@@ -188,13 +188,12 @@ let
         libunwind = libraries.libunwind;
       }));
 
-    openmp = callPackage ./openmp.nix {};
-
     libunwind = callPackage ./libunwind ({} //
       (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
       }));
 
+    openmp = callPackage ./openmp.nix {};
   });
 
 in { inherit tools libraries; } // libraries // tools
diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix
index 69c6564babe7..d119460736c3 100644
--- a/pkgs/development/compilers/llvm/11/default.nix
+++ b/pkgs/development/compilers/llvm/11/default.nix
@@ -189,13 +189,12 @@ let
         libunwind = libraries.libunwind;
       }));
 
-    openmp = callPackage ./openmp.nix {};
-
     libunwind = callPackage ./libunwind ({} //
       (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
       }));
 
+    openmp = callPackage ./openmp.nix {};
   });
 
 in { inherit tools libraries; } // libraries // tools
diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix
index 9a2bfb3fb40e..73a8b7a90a0e 100644
--- a/pkgs/development/compilers/llvm/12/default.nix
+++ b/pkgs/development/compilers/llvm/12/default.nix
@@ -236,7 +236,6 @@ let
     });
 
     openmp = callPackage ./openmp { inherit llvm_meta; };
-
   });
 
 in { inherit tools libraries; } // libraries // tools
diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix
index bcbbd155e36c..2ff579d071d5 100644
--- a/pkgs/development/compilers/llvm/8/default.nix
+++ b/pkgs/development/compilers/llvm/8/default.nix
@@ -191,13 +191,12 @@ let
         libunwind = libraries.libunwind;
       }));
 
-    openmp = callPackage ./openmp.nix {};
-
     libunwind = callPackage ./libunwind ({} //
       (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
       }));
 
+    openmp = callPackage ./openmp.nix {};
   });
 
 in { inherit tools libraries; } // libraries // tools
diff --git a/pkgs/development/compilers/llvm/9/default.nix b/pkgs/development/compilers/llvm/9/default.nix
index 0660bac137f6..8a1400dfd375 100644
--- a/pkgs/development/compilers/llvm/9/default.nix
+++ b/pkgs/development/compilers/llvm/9/default.nix
@@ -191,13 +191,12 @@ let
         libunwind = libraries.libunwind;
       }));
 
-    openmp = callPackage ./openmp.nix {};
-
     libunwind = callPackage ./libunwind ({} //
       (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
       }));
 
+    openmp = callPackage ./openmp.nix {};
   });
 
 in { inherit tools libraries; } // libraries // tools