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

fetch submodule before checking llvm stamp #122632

Merged
merged 2 commits into from
Apr 16, 2024
Merged

fetch submodule before checking llvm stamp #122632

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b75e6b4
fetch submodule before checking llvm stamp
onur-ozkan Mar 17, 2024
3683b11
create `Build::update_existing_submodule` and use for llvm
onur-ozkan Mar 28, 2024
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
Next Next commit
fetch submodule before checking llvm stamp 
Previously, we were checking the LLVM stamp before fetching the submodule
which leads to not being able to compile llvm on submodule updates.

Signed-off-by: onur-ozkan <[email protected]>
  • Loading branch information
@onur-ozkan
onur-ozkan committed Mar 17, 2024
commit b75e6b4e7e7b12b461e70a5ffaf280b46c746575
2 changes: 1 addition & 1 deletion src/bootstrap/src/core/build_steps/llvm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ pub fn prebuilt_llvm_config(
}
}

builder.update_submodule(&Path::new("src").join("llvm-project"));
let root = "src/llvm-project/llvm";
let out_dir = builder.llvm_out(target);

Expand Down Expand Up @@ -279,7 +280,6 @@ impl Step for Llvm {
Err(m) => m,
};

builder.update_submodule(&Path::new("src").join("llvm-project"));
if builder.llvm_link_shared() && target.is_windows() {
panic!("shared linking to LLVM is not currently supported on {}", target.triple);
}
Expand Down
Loading