From 210060e66cff887497896dbf6daecbca0204ceb1 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 24 Oct 2025 20:18:58 +0100
Subject: [PATCH] =?UTF-8?q?llvmPackages.openmp:=20don=E2=80=99t=20use=20a?=
 =?UTF-8?q?=20target=20platform=20LLVM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This was used in 4b07aeae16811bcb6ab2cef67133180bcb30ed67 to get
what was actually a *host* LLVM in practice, when the `buildHost`
LLVM package set was included in the `callPackage` scope used for
libraries. It should no longer be necessary and is now quite confusing.
---
 pkgs/development/compilers/llvm/common/default.nix       | 9 +--------
 .../development/compilers/llvm/common/openmp/default.nix | 3 +--
 pkgs/development/rocm-modules/6/llvm/default.nix         | 1 -
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix
index 5da66a77aad2..617237089f9c 100644
--- a/pkgs/development/compilers/llvm/common/default.nix
+++ b/pkgs/development/compilers/llvm/common/default.nix
@@ -108,14 +108,7 @@ let
 in
 makeScopeWithSplicing' {
   inherit otherSplices;
-  extra =
-    spliced0:
-    args
-    // metadata
-    // {
-      inherit buildLlvmPackages;
-      targetLlvm = spliced0.llvm.__spliced._targetTarget or llvm;
-    };
+  extra = _spliced0: args // metadata // { inherit buildLlvmPackages; };
   f =
     self:
     let
diff --git a/pkgs/development/compilers/llvm/common/openmp/default.nix b/pkgs/development/compilers/llvm/common/openmp/default.nix
index 2e293d41d8c9..d3bd81530bd3 100644
--- a/pkgs/development/compilers/llvm/common/openmp/default.nix
+++ b/pkgs/development/compilers/llvm/common/openmp/default.nix
@@ -9,7 +9,6 @@
   cmake,
   ninja,
   llvm,
-  targetLlvm,
   lit,
   clang-unwrapped,
   perl,
@@ -62,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm)
+    llvm
   ]
   ++ lib.optionals (ompdSupport && ompdGdbSupport) [
     python3
diff --git a/pkgs/development/rocm-modules/6/llvm/default.nix b/pkgs/development/rocm-modules/6/llvm/default.nix
index cb95a21041b7..3b03a66574c2 100644
--- a/pkgs/development/rocm-modules/6/llvm/default.nix
+++ b/pkgs/development/rocm-modules/6/llvm/default.nix
@@ -501,7 +501,6 @@ overrideLlvmPackagesRocm (s: {
     with s.final;
     (llvmPackagesRocm.openmp.override {
       llvm = llvm;
-      targetLlvm = llvm;
       clang-unwrapped = clang-unwrapped;
     }).overrideAttrs
       (old: {