Skip to content

fix: use same profile for embed binary to avoid double compilation #2238

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
mildbyte wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix: use same profile for embed binary to avoid double compilation #2238

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
13 changes: 8 additions & 5 deletions cargo-pgrx/src/command/schema.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,9 +207,9 @@ pub(crate) fn generate_schema_implicit(
tracing::info!(dot = %dot_path.display(), "Writing Graphviz DOT");
}

second_build(cargo, &features_arg, embed.path(), &manifest)?;
second_build(cargo, &features_arg, embed.path(), &manifest, profile)?;

compute_sql(&manifest)?;
compute_sql(&manifest, profile)?;

Ok(())
}
Expand Down Expand Up @@ -452,6 +452,7 @@ fn second_build(
features_arg: &str,
embed_path: &Path,
manifest: &Manifest,
profile: &CargoProfile,
) -> eyre::Result<()> {
// We do pass cfg to the binary and do not pass cfg to dependencies to avoid recompilation
// The only cargo command respecting our need is `cargo rustc`
Expand All @@ -460,6 +461,8 @@ fn second_build(
.flag_args("--bin", vec![pgrx_embed_name(manifest)?])
.into_command();

command.args(profile.cargo_args());

command.arg("--");

command.args(["--cfg", "pgrx_embed"]);
Expand All @@ -468,7 +471,7 @@ fn second_build(

let command_str = format!("{command:?}");
eprintln!(
"{} {}, in debug mode, for SQL generation with features {}",
"{} {} for SQL generation with features {}",
" Rebuilding".bold().green(),
"pgrx_embed".cyan(),
features_arg.cyan(),
Expand All @@ -487,9 +490,9 @@ fn second_build(
Ok(())
}

fn compute_sql(manifest: &Manifest) -> eyre::Result<()> {
fn compute_sql(manifest: &Manifest, profile: &CargoProfile) -> eyre::Result<()> {
let mut bin = get_target_dir()?;
bin.push("debug"); // pgrx_embed_ is always compiled in debug mode
bin.push(profile.target_subdir());
bin.push(pgrx_embed_name(manifest)?);

let mut command = std::process::Command::new(bin);
Expand Down
Loading