Merge pull request #238129 from alexfmpe/ispc-darwin

Janik 04294b83 1fab0a65

Changed files
+6 -4
pkgs
development
compilers
top-level
+5 -4
pkgs/development/compilers/ispc/default.nix
···
{ lib, stdenv, fetchFromGitHub, fetchpatch
-
, cmake, which, m4, python3, bison, flex, llvmPackages, ncurses
# the default test target is sse4, but that is not supported by all Hydra agents
, testedTargets ? if stdenv.isAarch64 || stdenv.isAarch32 then [ "neon-i32x4" ] else [ "sse2-i32x4" ]
···
sha256 = "sha256-WBAVgjQjW4x9JGx6xotPoTVOePsPjBJEyBYA7TCTBvc=";
};
-
nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev ];
buildInputs = with llvmPackages; [
libllvm libclang openmp ncurses
];
···
inherit testedTargets;
-
# needs 'transcendentals' executable, which is only on linux
-
doCheck = stdenv.isLinux;
# the compiler enforces -Werror, and -fno-strict-overflow makes it mad.
# hilariously this is something of a double negative: 'disable' the
···
"-DISPC_INCLUDE_UTILS=OFF"
("-DARM_ENABLED=" + (if stdenv.isAarch64 || stdenv.isAarch32 then "TRUE" else "FALSE"))
("-DX86_ENABLED=" + (if stdenv.isx86_64 || stdenv.isx86_32 then "TRUE" else "FALSE"))
];
meta = with lib; {
···
{ lib, stdenv, fetchFromGitHub, fetchpatch
+
, cmake, which, m4, python3, bison, flex, llvmPackages, ncurses, xcode
# the default test target is sse4, but that is not supported by all Hydra agents
, testedTargets ? if stdenv.isAarch64 || stdenv.isAarch32 then [ "neon-i32x4" ] else [ "sse2-i32x4" ]
···
sha256 = "sha256-WBAVgjQjW4x9JGx6xotPoTVOePsPjBJEyBYA7TCTBvc=";
};
+
nativeBuildInputs = [ cmake which m4 bison flex python3 llvmPackages.libllvm.dev ] ++ lib.lists.optionals stdenv.isDarwin [ xcode ];
buildInputs = with llvmPackages; [
libllvm libclang openmp ncurses
];
···
inherit testedTargets;
+
doCheck = true;
# the compiler enforces -Werror, and -fno-strict-overflow makes it mad.
# hilariously this is something of a double negative: 'disable' the
···
"-DISPC_INCLUDE_UTILS=OFF"
("-DARM_ENABLED=" + (if stdenv.isAarch64 || stdenv.isAarch32 then "TRUE" else "FALSE"))
("-DX86_ENABLED=" + (if stdenv.isx86_64 || stdenv.isx86_32 then "TRUE" else "FALSE"))
+
] ++ lib.lists.optionals stdenv.isDarwin [
+
"-DISPC_MACOS_SDK_PATH=${xcode}/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
];
meta = with lib; {
+1
pkgs/top-level/all-packages.nix
···
ispc = callPackage ../development/compilers/ispc {
inherit (llvmPackages) stdenv;
};
isso = callPackage ../servers/isso {
···
ispc = callPackage ../development/compilers/ispc {
inherit (llvmPackages) stdenv;
+
xcode = darwin.xcode_14;
};
isso = callPackage ../servers/isso {