Skip to content

Commit 107da0e

Browse files
committed
Fix installing debuginfo files for plugins in the wrong folder
They're supposed to be side-by-side, and for plugins they were being installed in the bindir.
1 parent c09bf19 commit 107da0e

1 file changed

Lines changed: 11 additions & 3 deletions

File tree

src/install.rs

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -285,9 +285,17 @@ pub fn cinstall(ws: &Workspace, packages: &[CPackage]) -> anyhow::Result<()> {
285285
ws.gctx()
286286
.shell()
287287
.status("Installing", "debugging information")?;
288-
let destination_path = build_targets
289-
.debug_info_file_name(&install_path_bin, &install_path_lib)
290-
.unwrap();
288+
289+
let destination_path = if capi_config.library.install_subdir.is_none() {
290+
build_targets
291+
.debug_info_file_name(&install_path_bin, &install_path_lib)
292+
.unwrap()
293+
} else {
294+
// We assume they are plugins, install them in the custom libdir path
295+
build_targets
296+
.debug_info_file_name(&install_path_lib, &install_path_lib)
297+
.unwrap()
298+
};
291299

292300
create_dir_all(destination_path.parent().unwrap())?;
293301
copy(ws, debug_info, destination_path)?;

0 commit comments

Comments
 (0)