pyrox.dev
Merge pull request #168508 from trofi/pcre-on-crossen
pcre, pcre2: autodetect jit support, don't force-enable
authored by Martin Weinelt and committed by GitHub 95fb30e5 33425fdc
+1
-1
pkgs/development/libraries/pcre/default.nix
+1
-1
pkgs/development/libraries/pcre/default.nix
···
21
21
outputs = [ "bin" "dev" "out" "doc" "man" ];
22
22
23
23
# Disable jit on Apple Silicon, https://github.com/zherczeg/sljit/issues/51
24
-
configureFlags = optional (!stdenv.hostPlatform.isRiscV && !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) "--enable-jit" ++ [
24
+
configureFlags = optional (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) "--enable-jit=auto" ++ [
25
25
"--enable-unicode-properties"
26
26
"--disable-cpp"
27
27
]
+1
-3
pkgs/development/libraries/pcre2/default.nix
+1
-3
pkgs/development/libraries/pcre2/default.nix
···
15
15
configureFlags = [
16
16
"--enable-pcre2-16"
17
17
"--enable-pcre2-32"
18
-
] ++ lib.optional (!stdenv.hostPlatform.isRiscV &&
19
-
!(stdenv.hostPlatform.isDarwin &&
20
-
stdenv.hostPlatform.isAarch64)) "--enable-jit";
18
+
] ++ lib.optional (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) "--enable-jit=auto";
21
19
22
20
outputs = [ "bin" "dev" "out" "doc" "man" "devdoc" ];
23
21