Define CMAKE_SYSTEM_NAME on a cross build targeting DragonFly.

[inferiorhumanorgans]

Without CMAKE_SYSTEM_NAME set to the target a cross compile will generally fail. Related to #109170.

[rustbot]

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @ozkanonur (or someone else) soon.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

• @rustbot author: the review is finished, PR author should check the comments and take action accordingly
• @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

[rustbot]

This PR changes how LLVM is built. Consider updating src/bootstrap/download-ci-llvm-stamp.

[inferiorhumanorgans]

Given that this list is likely a.) not complete and b.) will grow over time, would it make sense to call splitn on target and turn this into a match statement instead?

[onur-ozkan]

LGTM after the update of

rust/src/bootstrap/download-ci-llvm-stamp

Lines 1 to 4 in 8771282

	Change this file to make users of the `download-ci-llvm` configuration download
	a new version of LLVM from CI, even if the LLVM submodule hasn’t changed.
	Last change is for: https://github.com/rust-lang/rust/pull/112931

[onur-ozkan]

would it make sense to call splitn on target and turn this into a match statement instead?

I don't think it makes any difference since it's still a string comparison

[inferiorhumanorgans]

would it make sense to call splitn on target and turn this into a match statement instead?

I don't think it makes any difference since it's still a string comparison

Ah I was thinking mainly in terms of legibility, however that wouldn't account for platforms where the triplet is actually a quadruplet (e.g. linux-musl or windows-msvc).

Anyways the other thing that comes to mind is printing a warning if CMAKE_SYSTEM_NAME is left undefined e.g.

} else {
    eprintln!("could not determine CMAKE_SYSTEM_NAME from the target `{target}`, build may fail")
}

[onur-ozkan]

Anyways the other thing that comes to mind is printing a warning if CMAKE_SYSTEM_NAME is left undefined e.g.

} else {
    eprintln!("could not determine CMAKE_SYSTEM_NAME from the target `{target}`, build may fail")
}

This seems better. Can you add that else block which prints this information with builder.info instead of eprintln? Once this is done with squashing the commits into single one, we can land this :)

[onur-ozkan]

Thanks a lot!

@bors r+ rollup

[bors]

📌 Commit a0538db has been approved by ozkanonur

It is now in the queue for this repository.

[bors]

⌛ Testing commit a0538db with merge 2395c2294bc198f37c162a70f516a6e2b1be2aa6...

[rust-log-analyzer]

The job mingw-check failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

[TIMING] compile::Std { target: x86_64-unknown-linux-gnu, compiler: Compiler { stage: 0, host: x86_64-unknown-linux-gnu }, crates: [], force_recompile: false } -- 0.129
##[group]Documenting compiler {coverage_test_macros, rustc-main, rustc_abi, rustc_apfloat, rustc_arena, rustc_ast, rustc_ast_lowering, rustc_ast_passes, rustc_ast_pretty, rustc_attr, rustc_baked_icu_data, rustc_borrowck, rustc_builtin_macros, rustc_codegen_llvm, rustc_codegen_ssa, rustc_const_eval, rustc_data_structures, rustc_driver, rustc_driver_impl, rustc_error_codes, rustc_error_messages, rustc_errors, rustc_expand, rustc_feature, rustc_fluent_macro, rustc_fs_util, rustc_graphviz, rustc_hir, rustc_hir_analysis, rustc_hir_pretty, rustc_hir_typeck, rustc_incremental, rustc_index, rustc_infer, rustc_interface, rustc_lexer, rustc_lint, rustc_lint_defs, rustc_llvm, rustc_log, rustc_macros, rustc_metadata, rustc_middle, rustc_mir_build, rustc_mir_dataflow, rustc_mir_transform, rustc_monomorphize, rustc_parse, rustc_parse_format, rustc_passes, rustc_plugin_impl, rustc_privacy, rustc_query_impl, rustc_query_system, rustc_resolve, rustc_serialize, rustc_session, rustc_smir, rustc_span, rustc_symbol_mangling, rustc_target, rustc_trait_selection, rustc_traits, rustc_transmute, rustc_ty_utils, rustc_type_ir} (stage0 -> stage1, x86_64-unknown-linux-gnu)
[TIMING] tool::Rustdoc { compiler: Compiler { stage: 0, host: x86_64-unknown-linux-gnu } } -- 0.000
##[group]Building LLVM for x86_64-unknown-linux-gnu
thread 'main' panicked at 'nested groups are not supported by GHA!', llvm.rs:275:30
##[endgroup]
Build completed unsuccessfully in 0:00:00
##[group]Clock drift check
  local time: Tue Jul 25 07:30:21 UTC 2023

[bors]

💔 Test failed - checks-actions

[onur-ozkan]

Seems like a regression from #113514 similar to #113798

[onur-ozkan]

a fix PR was merged #114062

@bors retry