diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2022-10-31 12:24:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-31 12:24:11 +0100 |
| commit | 3c6a81eb60d3fbf8294934b6a53a96cb8910c68a (patch) | |
| tree | f1b11c1157424feb82a126d04b01d6ad66f072bf /pkgs/development/libraries | |
| parent | 1093c9b4e1437453587054816fc2ab9a14df081c (diff) | |
| parent | 57ad558d1762831a811931b29354ecd38a6207cc (diff) | |
Merge pull request #197676 from squalus/tbb-cross-aarch64
tbb: fix cross compile to aarch64
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/tbb/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix index 4617614b25eeb..21fddb1656270 100644 --- a/pkgs/development/libraries/tbb/default.nix +++ b/pkgs/development/libraries/tbb/default.nix @@ -51,7 +51,10 @@ stdenv.mkDerivation rec { makeFlags = lib.optionals stdenv.cc.isClang [ "compiler=clang" - ]; + ] ++ (lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) + (if stdenv.hostPlatform.isAarch64 then "arch=arm64" + else if stdenv.hostPlatform.isx86_64 then "arch=intel64" + else throw "Unsupported cross architecture")); enableParallelBuilding = true; |