Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't set linker for Rust static libraries #275

Merged
merged 1 commit into from
Dec 18, 2022
Merged

Don't set linker for Rust static libraries #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 24 additions & 11 deletions cmake/Corrosion.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,8 +699,8 @@ endif()
# A target may be either a specific bin
function(_add_cargo_build out_cargo_build_out_dir)
set(options NO_LINKER_OVERRIDE)
set(one_value_args PACKAGE TARGET MANIFEST_PATH PROFILE TARGET_KIND WORKSPACE_MANIFEST_PATH)
set(multi_value_args BYPRODUCTS)
set(one_value_args PACKAGE TARGET MANIFEST_PATH PROFILE WORKSPACE_MANIFEST_PATH)
set(multi_value_args BYPRODUCTS TARGET_KINDS)
cmake_parse_arguments(
ACB
"${options}"
Expand All @@ -713,17 +713,18 @@ function(_add_cargo_build out_cargo_build_out_dir)
set(target_name "${ACB_TARGET}")
set(path_to_toml "${ACB_MANIFEST_PATH}")
set(cargo_profile_name "${ACB_PROFILE}")
set(target_kind "${ACB_TARGET_KIND}")
set(target_kinds "${ACB_TARGET_KINDS}")
set(workspace_manifest_path "${ACB_WORKSPACE_MANIFEST_PATH}")

if(NOT target_kind)
message(FATAL_ERROR "TARGET_KIND not specified")
elseif(target_kind STREQUAL "lib")

if(NOT target_kinds)
message(FATAL_ERROR "TARGET_KINDS not specified")
elseif("staticlib" IN_LIST target_kinds OR "cdylib" IN_LIST target_kinds)
set(cargo_rustc_filter "--lib")
elseif(target_kind STREQUAL "bin")
elseif("bin" IN_LIST target_kinds)
set(cargo_rustc_filter "--bin=${target_name}")
else()
message(FATAL_ERROR "TARGET_KIND must be `lib` or `bin`, but was `${target_kind}`")
message(FATAL_ERROR "TARGET_KINDS contained unknown kind `${target_kind}`")
endif()

if (NOT IS_ABSOLUTE "${path_to_toml}")
Expand All @@ -742,9 +743,21 @@ function(_add_cargo_build out_cargo_build_out_dir)
unset(is_windows_msvc)
get_source_file_property(is_windows_msvc "${workspace_manifest_path}" CORROSION_PLATFORM_IS_WINDOWS_MSVC)

# For MSVC targets, don't mess with linker preferences.
# TODO: We still should probably make sure that rustc is using the correct cl.exe to link programs.
if (NOT is_windows_msvc)
# Corrosions currently attempts to select a correct linker, based on the enabled languages.
# This approach is flawed and should be revisited in the future.
# Currently we disable this approach for the MSVC abi, because it just doesn't work
# and for static libraries, because the linker shouldn't be invoked for those, but
# potentially could be if Rust side build scripts or proc macros etc. happened to be involved.
# Overriding the linker in those cases is probably unwanted.
if(is_windows_msvc)
set(determine_linker_preference FALSE)
elseif("staticlib" IN_LIST target_kinds AND NOT "cdylib" IN_LIST target_kinds)
set(determine_linker_preference FALSE)
else()
set(determine_linker_preference TRUE)
endif()

if(determine_linker_preference)
set(languages C CXX Fortran)

set(has_compiler OFF)
Expand Down
4 changes: 2 additions & 2 deletions cmake/CorrosionGenerator.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ function(_generator_add_package_targets workspace_manifest_path package_manifest
MANIFEST_PATH "${manifest_path}"
WORKSPACE_MANIFEST_PATH "${workspace_manifest_path}"
PROFILE "${profile}"
TARGET_KIND "lib"
TARGET_KINDS "${kinds}"
BYPRODUCTS "${byproducts}"
)
if(archive_byproducts)
Expand Down Expand Up @@ -143,7 +143,7 @@ function(_generator_add_package_targets workspace_manifest_path package_manifest
MANIFEST_PATH "${manifest_path}"
WORKSPACE_MANIFEST_PATH "${workspace_manifest_path}"
PROFILE "${profile}"
TARGET_KIND "bin"
TARGET_KINDS "bin"
BYPRODUCTS "${byproducts}"
)
_corrosion_copy_byproducts(
Expand Down
29 changes: 24 additions & 5 deletions generator/src/subcommands/gen_cmake/target.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,26 @@ pub struct CargoTarget {
workspace_manifest_path: Rc<PathBuf>,
}

impl CargoTargetType {
fn to_string(&self) -> String {
let mut s = String::new();
match self {
Self::Executable => {
s.push_str("bin");
},
Self::Library { has_staticlib, has_cdylib} => {
if *has_staticlib {
s.push_str("staticlib")
}
if *has_cdylib {
s.push_str(" cdylib")
}
}
}
s
}
}

impl CargoTarget {
pub fn from_metadata(
cargo_package: Rc<cargo_metadata::Package>,
Expand Down Expand Up @@ -75,7 +95,7 @@ impl CargoTarget {
.expect("Non-utf8 path encountered")
.replace("\\", "/");

let target_kind = match self.target_type {
match self.target_type {
CargoTargetType::Library {
has_staticlib,
has_cdylib,
Expand Down Expand Up @@ -109,7 +129,6 @@ impl CargoTarget {
has_staticlib = has_staticlib,
has_cdylib = has_cdylib,
)?;
"lib"
}
CargoTargetType::Executable => {
writeln!(
Expand All @@ -124,9 +143,9 @@ impl CargoTarget {
workspace_manifest_path = ws_manifest,
target_name = self.cargo_target.name,
)?;
"bin"
}
};
let target_kinds = self.target_type.to_string();
writeln!(out_file,
"
set(cargo_build_out_dir \"\")
Expand All @@ -137,7 +156,7 @@ impl CargoTarget {
MANIFEST_PATH \"{package_manifest_path}\"
WORKSPACE_MANIFEST_PATH \"{workspace_manifest_path}\"
{profile_option}
TARGET_KIND \"{target_kind}\"
TARGET_KINDS {target_kinds}
BYPRODUCTS \"${{byproducts}}\"
)

Expand Down Expand Up @@ -171,7 +190,7 @@ impl CargoTarget {
package_manifest_path = self.cargo_package.manifest_path.as_str().replace("\\", "/"),
workspace_manifest_path = ws_manifest,
profile_option = cargo_build_profile_option,
target_kind = target_kind,
target_kinds = target_kinds,

)?;
Ok(())
Expand Down