Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
37 changes: 26 additions & 11 deletions rocks-lib/src/build/builtin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,32 @@ impl Build for BuiltinBuildSpec {
for (counter, (destination_path, module_type)) in modules.iter().enumerate() {
match module_type {
ModuleSpec::SourcePath(source) => {
bar.set_message(format!(
"Copying {} to {}...",
&source.to_string_lossy(),
&destination_path
));
let absolute_source_path = build_dir.join(source);
utils::copy_lua_to_module_path(
&absolute_source_path,
destination_path,
&output_paths.src,
)?
if source.extension().map(|ext| ext == "c").unwrap_or(false) {
bar.set_message(format!(
"Compiling {} -> {}...",
&source.to_string_lossy(),
&destination_path
));
let absolute_source_paths = vec![build_dir.join(source)];
utils::compile_c_files(
&absolute_source_paths,
destination_path,
&output_paths.lib,
lua,
)?
} else {
bar.set_message(format!(
"Copying {} to {}...",
&source.to_string_lossy(),
&destination_path
));
let absolute_source_path = build_dir.join(source);
utils::copy_lua_to_module_path(
&absolute_source_path,
destination_path,
&output_paths.src,
)?
}
}
ModuleSpec::SourcePaths(files) => {
bar.set_message("Compiling C files...");
Expand Down
18 changes: 13 additions & 5 deletions rocks-lib/src/rockspec/build/utils/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,18 +58,26 @@ pub fn compile_c_files(

// TODO: Use `target-lexicon` data here instead, it's more reliable.

cc::Build::new()
// See https://github.com/rust-lang/cc-rs/issues/594#issuecomment-2110551057

let mut build = cc::Build::new();
let build = build
.cargo_metadata(false)
.debug(false)
.files(files)
.host(std::env::consts::OS)
.includes(&lua.include_dir)
.opt_level(3)
.out_dir(parent)
.shared_flag(true)
.target(std::env::consts::ARCH)
.try_compile(file.to_str().unwrap())?;

.target(std::env::consts::ARCH);
let objects = build.compile_intermediates();
build
.get_compiler()
.to_command()
.args(["-shared", "-o"])
.arg(parent.join(file))
.args(&objects)
.status()?;
Ok(())
}

Expand Down