Skip to content

Only link and bundle in command line script when not building with --output-o or --output-bc #72

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

Open
apozharski wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Only link and bundle in command line script when not building with --output-o or --output-bc #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b42564b
add should_be_linked
apozharski Nov 6, 2025
10412ae
Also check before bundling in the CLI
apozharski Nov 6, 2025
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
10 changes: 8 additions & 2 deletions src/JuliaC.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,14 @@ function _main_cli(args::Vector{String}; io::IO=stdout)
end
img, link, bun = _parse_cli_args(args)
compile_products(img)
link_products(link)
bundle_products(bun)
if should_be_linked(link)
# Only link when not building with --output-o or --output-bc
link_products(link)
end
if should_be_bundled(bun)
# Only bundle when not building with --output-o or --output-bc
bundle_products(bun)
end
end

function (@main)(ARGS)
Expand Down
9 changes: 7 additions & 2 deletions src/bundling.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
function should_be_bundled(recipe::BundleRecipe)
output_type = recipe.link_recipe.image_recipe.output_type
return !(output_type == "--output-o" || output_type == "--output-bc")
end

function bundle_products(recipe::BundleRecipe)
bundle_start = time_ns()

# Validate that bundling makes sense for this output type
output_type = recipe.link_recipe.image_recipe.output_type
if output_type == "--output-o" || output_type == "--output-bc"
if !should_be_bundled(recipe)
output_type = recipe.link_recipe.image_recipe.output_type
error("Cannot bundle $(output_type) output type. $(output_type) generates object files/archives that don't require bundling. Use compile_products() directly instead of bundle_products().")
end

Expand Down
6 changes: 5 additions & 1 deletion src/linking.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,16 @@ function get_compiler_cmd(; cplusplus::Bool=false)
return compiler_cmd
end

function should_be_linked(recipe::LinkRecipe)
return !(recipe.image_recipe.output_type == "--output-o" || recipe.image_recipe.output_type == "--output-bc")
end

function link_products(recipe::LinkRecipe)
link_start = time_ns()
image_recipe = recipe.image_recipe

# Validate that linking makes sense for this output type
if image_recipe.output_type == "--output-o" || image_recipe.output_type == "--output-bc"
if !should_be_linked(recipe)
error("Cannot link $(image_recipe.output_type) output type. $(image_recipe.output_type) generates object files/archives that don't require linking. Use compile_products() directly instead of link_products().")
end
if image_recipe.output_type == "--output-lib" || image_recipe.output_type == "--output-sysimage"
Expand Down
Loading