diff --git a/cmake/PCRE2.cmake b/cmake/PCRE2.cmake index 73a375eae..372cadd58 100644 --- a/cmake/PCRE2.cmake +++ b/cmake/PCRE2.cmake @@ -6,5 +6,5 @@ if(FISH_USE_SYSTEM_PCRE2) set(FISH_PCRE2_BUILDFLAG "") else() 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) diff --git a/cmake/Rust.cmake b/cmake/Rust.cmake index 7a7949663..ba66a0078 100644 --- a/cmake/Rust.cmake +++ b/cmake/Rust.cmake @@ -56,6 +56,5 @@ set(VARS_FOR_CARGO "LOCALEDIR=${CMAKE_INSTALL_FULL_LOCALEDIR}" "CARGO_TARGET_DIR=${FISH_RUST_BUILD_DIR}" "CARGO_BUILD_RUSTC=${RUSTC_EXECUTABLE}" - "${FISH_PCRE2_BUILDFLAG}" "RUSTFLAGS=$ENV{RUSTFLAGS} ${rust_debugflags}" )