diff options
| author | Artturi <Artturin@artturin.com> | 2023-11-01 08:30:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-01 08:30:11 +0200 |
| commit | 7a57421d89a12640f672e872a3ea747feff1cc8d (patch) | |
| tree | 956a610f8e66ca8a021fd0db7ca0e50cecef81ae /pkgs/development/compilers | |
| parent | 42bea51aa72520aee227f47c9257875306d0e4c8 (diff) | |
| parent | fcc44e9aeae563b9beea171ef47d1a11dd117d12 (diff) | |
| download | nixpkgs-7a57421d89a12640f672e872a3ea747feff1cc8d.tar nixpkgs-7a57421d89a12640f672e872a3ea747feff1cc8d.tar.gz nixpkgs-7a57421d89a12640f672e872a3ea747feff1cc8d.tar.bz2 nixpkgs-7a57421d89a12640f672e872a3ea747feff1cc8d.tar.lz nixpkgs-7a57421d89a12640f672e872a3ea747feff1cc8d.tar.xz nixpkgs-7a57421d89a12640f672e872a3ea747feff1cc8d.tar.zst nixpkgs-7a57421d89a12640f672e872a3ea747feff1cc8d.zip | |
Merge pull request #264344 from alyssais/openmp-cross
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/llvm/12/openmp/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/13/openmp/default.nix | 11 |
2 files changed, 22 insertions, 0 deletions
diff --git a/pkgs/development/compilers/llvm/12/openmp/default.nix b/pkgs/development/compilers/llvm/12/openmp/default.nix index e0bcf03e00e..6040f3d1621 100644 --- a/pkgs/development/compilers/llvm/12/openmp/default.nix +++ b/pkgs/development/compilers/llvm/12/openmp/default.nix @@ -2,6 +2,7 @@ , stdenv , llvm_meta , fetch +, fetchpatch , cmake , llvm , targetLlvm @@ -15,6 +16,16 @@ stdenv.mkDerivation rec { src = fetch pname "14dh0r6h2xh747ffgnsl4z08h0ri04azi9vf79cbz7ma1r27kzk0"; + patches = [ + # Fix cross. + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/5e2358c781b85a18d1463fd924d2741d4ae5e42e.patch"; + hash = "sha256-UxIlAifXnexF/MaraPW0Ut6q+sf3e7y1fMdEv1q103A="; + }) + ]; + + patchFlags = [ "-p2" ]; + nativeBuildInputs = [ cmake perl ]; buildInputs = [ (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm) diff --git a/pkgs/development/compilers/llvm/13/openmp/default.nix b/pkgs/development/compilers/llvm/13/openmp/default.nix index 8eca980d601..7b461df438f 100644 --- a/pkgs/development/compilers/llvm/13/openmp/default.nix +++ b/pkgs/development/compilers/llvm/13/openmp/default.nix @@ -2,6 +2,7 @@ , stdenv , llvm_meta , src +, fetchpatch , cmake , llvm , targetLlvm @@ -16,6 +17,16 @@ stdenv.mkDerivation rec { inherit src; sourceRoot = "${src.name}/${pname}"; + patches = [ + # Fix cross. + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/5e2358c781b85a18d1463fd924d2741d4ae5e42e.patch"; + hash = "sha256-UxIlAifXnexF/MaraPW0Ut6q+sf3e7y1fMdEv1q103A="; + }) + ]; + + patchFlags = [ "-p2" ]; + nativeBuildInputs = [ cmake perl ]; buildInputs = [ (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm) |