Commit 4b07aeae authored by squalus's avatar squalus
Browse files

openmp: fix cross compile

parent e0e0c4db

pkgs/development/compilers/llvm/10/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith

, buildLlvmTools # tools, but from the previous stage, for cross

, targetLlvmLibraries # libraries, but from the next stage, for cross

, targetLlvm

# This is the default binutils, but with *this* version of LLD rather

# than the default LLVM verion's, if LLD is the choice. We use these for

# the `useLLVM` bootstrapping below.
@@ -259,7 +260,7 @@ let 
    };



    openmp = callPackage ./openmp {

      inherit llvm_meta;

      inherit llvm_meta targetLlvm;

    };

  });

pkgs/development/compilers/llvm/10/openmp/default.nix

+4 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
, fetch

, cmake

, llvm

, targetLlvm

, perl

, version

}:
@@ -15,7 +16,9 @@ stdenv.mkDerivation rec { 
  src = fetch pname "0i4bn84lkpm5w3qkpvwm5z6jdj8fynp7d3bcasa1xyq4is6757yi";



  nativeBuildInputs = [ cmake perl ];

  buildInputs = [ llvm ];

  buildInputs = [

    (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm)

  ];



  meta = llvm_meta // {

    homepage = "https://openmp.llvm.org/";

pkgs/development/compilers/llvm/11/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith

, buildLlvmTools # tools, but from the previous stage, for cross

, targetLlvmLibraries # libraries, but from the next stage, for cross

, targetLlvm

# This is the default binutils, but with *this* version of LLD rather

# than the default LLVM verion's, if LLD is the choice. We use these for

# the `useLLVM` bootstrapping below.
@@ -274,7 +275,7 @@ let 
    };



    openmp = callPackage ./openmp {

      inherit llvm_meta;

      inherit llvm_meta targetLlvm;

    };

  });

pkgs/development/compilers/llvm/11/openmp/default.nix

+4 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
, fetchpatch

, cmake

, llvm

, targetLlvm

, perl

, version

}:
@@ -25,7 +26,9 @@ stdenv.mkDerivation rec { 
  ];



  nativeBuildInputs = [ cmake perl ];

  buildInputs = [ llvm ];

  buildInputs = [

    (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm)

  ];



  meta = llvm_meta // {

    homepage = "https://openmp.llvm.org/";

pkgs/development/compilers/llvm/12/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith

, buildLlvmTools # tools, but from the previous stage, for cross

, targetLlvmLibraries # libraries, but from the next stage, for cross

, targetLlvm

# This is the default binutils, but with *this* version of LLD rather

# than the default LLVM verion's, if LLD is the choice. We use these for

# the `useLLVM` bootstrapping below.
@@ -267,7 +268,7 @@ let 
    };



    openmp = callPackage ./openmp {

      inherit llvm_meta;

      inherit llvm_meta targetLlvm;

    };

  });