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
fish-shell/cmake/Rust.cmake

62 lines
1.9 KiB
CMake
Raw Normal View History

Mostly Revert "cmake: Remove code to resolve rustup toolchains" Apparently needed on our FreeBSD CI setup. This reverts commit 281df5daad2e55630a8e26fd990086446a0c568e.
2024-11-28 19:00:34 +00:00
# Trying to build using the resolved toolchain causes all kinds of weird errors
# Just let rustup do its job
set(Rust_RESOLVE_RUSTUP_TOOLCHAINS Off)
cmake: build executables by driving cargo directly Drops the requirement for Corrosion, as almost none of its extensive features are required.
2024-01-25 11:58:50 +00:00
include(FindRust)
find_package(Rust REQUIRED)
cmake: add support for vendored cmake Use a "cmake-vendored" directory if it exists, to avoid accessing the network if it's available, and a target to create an appropriate tarball to create that directory.
2023-03-30 04:01:23 +00:00
cmake: build executables by driving cargo directly Drops the requirement for Corrosion, as almost none of its extensive features are required.
2024-01-25 11:58:50 +00:00
set(FISH_RUST_BUILD_DIR "${CMAKE_BINARY_DIR}/cargo/build")
Initial Rust commit
2023-01-14 22:56:24 +00:00
Use `cargo build -Z build-std` for ASAN This is recommended and increases coverage.
2023-03-07 18:47:30 +00:00
if(DEFINED ASAN)
list(APPEND CARGO_FLAGS "-Z" "build-std")
cmake: build executables by driving cargo directly Drops the requirement for Corrosion, as almost none of its extensive features are required.
2024-01-25 11:58:50 +00:00
list(APPEND FISH_CRATE_FEATURES "asan")
Use `cargo build -Z build-std` for ASAN This is recommended and increases coverage.
2023-03-07 18:47:30 +00:00
endif()
Update docker files and cirrus config - Ubuntu focal is the lowest LTS release that we can support with only distro packages (e.g. no rustup). - Remove tsan from Cirrus (it's not working currently, and also not really important). - Remove Centos (it passes tests but I'm not sure it's worth adding; there isn't even an official docker image for CentOS Stream).
2024-08-04 08:18:06 +00:00
if(DEFINED TSAN)
list(APPEND CARGO_FLAGS "-Z" "build-std")
list(APPEND FISH_CRATE_FEATURES "tsan")
endif()
Use `cargo build -Z build-std` for ASAN This is recommended and increases coverage.
2023-03-07 18:47:30 +00:00
test_cargo-test: use Corrosion target dir This makes "ninja test" write only to the build directory, not to the source tree. This enables our docker script which mounts the source as read-only.
2024-01-12 07:25:06 +00:00
if (Rust_CARGO_TARGET)
cmake: build executables by driving cargo directly Drops the requirement for Corrosion, as almost none of its extensive features are required.
2024-01-25 11:58:50 +00:00
set(rust_target_dir "${FISH_RUST_BUILD_DIR}/${Rust_CARGO_TARGET}")
test_cargo-test: use Corrosion target dir This makes "ninja test" write only to the build directory, not to the source tree. This enables our docker script which mounts the source as read-only.
2024-01-12 07:25:06 +00:00
else()
cmake: build executables by driving cargo directly Drops the requirement for Corrosion, as almost none of its extensive features are required.
2024-01-25 11:58:50 +00:00
set(rust_target_dir "${FISH_RUST_BUILD_DIR}/${Rust_CARGO_HOST_TARGET}")
test_cargo-test: use Corrosion target dir This makes "ninja test" write only to the build directory, not to the source tree. This enables our docker script which mounts the source as read-only.
2024-01-12 07:25:06 +00:00
endif()
cmake: build executables by driving cargo directly Drops the requirement for Corrosion, as almost none of its extensive features are required.
2024-01-25 11:58:50 +00:00
set(rust_profile $<IF:$<CONFIG:Debug>,debug,release>)
Remove a CMake 3.19 construct CONFIG supports multiple arguments only as of CMake 3.19, see https://cmake.org/cmake/help/latest/manual/cmake-generator-expressions.7.html#configuration-expressions Ubuntu focal ships with 3.16 by default, so enable building with that. Note that there is also the workaround of installing "cmake-mozilla".
2024-08-04 11:00:00 +00:00
set(rust_debugflags "$<$<CONFIG:Debug>:-g>$<$<CONFIG:RelWithDebInfo>:-g>")
cmake: add -g to existing RUSTFLAGS if required Makes it possible to use the sanitizers again. Note that this requires RUSTFLAGS to be set when running CMake, and will not be updated when running the build system if the environment variable changes.
2024-02-07 16:28:28 +00:00
cmake: build executables by driving cargo directly Drops the requirement for Corrosion, as almost none of its extensive features are required.
2024-01-25 11:58:50 +00:00
Add rsconf build system and check for gettext symbols This is more complicated than it needs to be thanks to the presence of CMake and the C++ ffi in the picture. rsconf can correctly detect the required libraries and instruct rustc to link against them, but since we generate a static rust library and have CMake link it against the C++ binaries, we are still at the mercy of CMake picking up the symbols we want. Unfortunately, we could detect the gettext symbols but discover at runtime that they weren't linked in because CMake was compiled with `-DWITH_GETTEXT=0` or similar (as the macOS CI runner does). This means we also need to pass state between CMake and our build script to communicate which CMake options were enabled.
2023-05-16 18:02:22 +00:00
# Temporary hack to propogate CMake flags/options to build.rs. We need to get CMake to evaluate the
# truthiness of the strings if they are set.
set(CMAKE_WITH_GETTEXT "1")
if(DEFINED WITH_GETTEXT AND NOT "${WITH_GETTEXT}")
set(CMAKE_WITH_GETTEXT "0")
endif()
cmake: build executables by driving cargo directly Drops the requirement for Corrosion, as almost none of its extensive features are required.
2024-01-25 11:58:50 +00:00
if(FISH_CRATE_FEATURES)
set(FEATURES_ARG ${FISH_CRATE_FEATURES})
list(PREPEND FEATURES_ARG "--features")
endif()
get_property(
RUSTC_EXECUTABLE
TARGET Rust::Rustc PROPERTY IMPORTED_LOCATION
)
Remove some now unused CMake bits
2024-07-07 22:50:58 +00:00
# Tell Cargo where our build directory is so it can find Cargo.toml.
test_cargo-test: inherit same variables as Corrosion build targets In particular, pass the build directory, which is required in some test scenarios (see next commit).
2024-01-12 11:00:38 +00:00
set(VARS_FOR_CARGO
Move fish build dir canonicalization into build.rs, to lower CMake version
2024-08-04 08:18:06 +00:00
"FISH_BUILD_DIR=${CMAKE_BINARY_DIR}"
Port path.h
2023-04-09 12:33:20 +00:00
"PREFIX=${CMAKE_INSTALL_PREFIX}"
Add rsconf build system and check for gettext symbols This is more complicated than it needs to be thanks to the presence of CMake and the C++ ffi in the picture. rsconf can correctly detect the required libraries and instruct rustc to link against them, but since we generate a static rust library and have CMake link it against the C++ binaries, we are still at the mercy of CMake picking up the symbols we want. Unfortunately, we could detect the gettext symbols but discover at runtime that they weren't linked in because CMake was compiled with `-DWITH_GETTEXT=0` or similar (as the macOS CI runner does). This means we also need to pass state between CMake and our build script to communicate which CMake options were enabled.
2023-05-16 18:02:22 +00:00
# Temporary hack to propogate CMake flags/options to build.rs.
"CMAKE_WITH_GETTEXT=${CMAKE_WITH_GETTEXT}"
cmake: Fix SYSCONFDIR and friends
2023-09-06 07:35:56 +00:00
"DOCDIR=${CMAKE_INSTALL_FULL_DOCDIR}"
"DATADIR=${CMAKE_INSTALL_FULL_DATADIR}"
"SYSCONFDIR=${CMAKE_INSTALL_FULL_SYSCONFDIR}"
"BINDIR=${CMAKE_INSTALL_FULL_BINDIR}"
Port wgettext wrapper from wutil.cpp This introduces a string allocations on lookups of strings that are not known at compile time; we should get rid of these allocations in future.
2024-01-01 19:39:38 +00:00
"LOCALEDIR=${CMAKE_INSTALL_FULL_LOCALEDIR}"
cmake: build executables by driving cargo directly Drops the requirement for Corrosion, as almost none of its extensive features are required.
2024-01-25 11:58:50 +00:00
"CARGO_TARGET_DIR=${FISH_RUST_BUILD_DIR}"
"CARGO_BUILD_RUSTC=${RUSTC_EXECUTABLE}"
Fix the static PCRE2 build harder Commit 4e79ec5f tried to restore the static PCRE2 build after the update to the pcre2 crate, but it set an environment variable at configure time, not build time. Properly set the environment variable at build time.
2024-10-06 03:15:29 +00:00
"${FISH_PCRE2_BUILDFLAG}"
cmake: add -g to existing RUSTFLAGS if required Makes it possible to use the sanitizers again. Note that this requires RUSTFLAGS to be set when running CMake, and will not be updated when running the build system if the environment variable changes.
2024-02-07 16:28:28 +00:00
"RUSTFLAGS=$ENV{RUSTFLAGS} ${rust_debugflags}"
Rust.cmake: break up long line
2023-04-19 14:45:25 +00:00
)
Reference in a new issue Copy permalink