From ae34f371428684713dbacdfaff578ecdf2571ff0 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 13 Apr 2022 18:03:51 +0100 Subject: pcre, pcre2: autodetect jit support, don't force-enable PCRE JIT is not supported on most architectores: m68k, s390, ia64 to name a few. Example build failure is: $ nix build -f. pkgsCross.s390.pcre ... pcre_jit_compile.c:65:2: error: #error Unsupported architecture The change shifts from --enable-jit[=yes] to --enable-jit=auto which allows nixpkgs to enable jit automatically only on supported targets. --- pkgs/development/libraries/pcre/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/development/libraries/pcre') diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 5fc8d496ba9..9d4e52acb4d 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "doc" "man" ]; # Disable jit on Apple Silicon, https://github.com/zherczeg/sljit/issues/51 - configureFlags = optional (!stdenv.hostPlatform.isRiscV && !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) "--enable-jit" ++ [ + configureFlags = optional (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) "--enable-jit=auto" ++ [ "--enable-unicode-properties" "--disable-cpp" ] -- cgit 1.4.1