Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 05:13:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

CMake: Restore static PCRE2 builds

Browse source 
The recent update to the rust-pcre2 crate lost the property where a static
PCRE2 build could be enabled with a Cargo feature. This means that static
PCRE2 builds can no longer be forced.

Switch to setting the "PCRE2_SYS_STATIC" variable again, which is how the
official rust-pcre2 crate expects to work.
This commit is contained in:
Peter Ammon 2024-09-29 19:42:48 -07:00
parent c227233571
commit 4e79ec5f0e
No known key found for this signature in database
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/PCRE2.cmake
View file

@ -6,5 +6,5 @@ if(FISH_USE_SYSTEM_PCRE2)
set(FISH_PCRE2_BUILDFLAG "") set(FISH_PCRE2_BUILDFLAG "")
else() else()
message(STATUS "Forcing static build of PCRE2") message(STATUS "Forcing static build of PCRE2")
set(FISH_PCRE2_BUILDFLAG "CARGO_FEATURE_STATIC_PCRE2=1") set(ENV{PCRE2_SYS_STATIC} "1")
endif(FISH_USE_SYSTEM_PCRE2) endif(FISH_USE_SYSTEM_PCRE2)

1
cmake/Rust.cmake
View file

@ -56,6 +56,5 @@ set(VARS_FOR_CARGO
"LOCALEDIR=${CMAKE_INSTALL_FULL_LOCALEDIR}" "LOCALEDIR=${CMAKE_INSTALL_FULL_LOCALEDIR}"
"CARGO_TARGET_DIR=${FISH_RUST_BUILD_DIR}" "CARGO_TARGET_DIR=${FISH_RUST_BUILD_DIR}"
"CARGO_BUILD_RUSTC=${RUSTC_EXECUTABLE}" "CARGO_BUILD_RUSTC=${RUSTC_EXECUTABLE}"
"${FISH_PCRE2_BUILDFLAG}"
"RUSTFLAGS=$ENV{RUSTFLAGS} ${rust_debugflags}" "RUSTFLAGS=$ENV{RUSTFLAGS} ${rust_debugflags}"
) )