Skip to content

Commit b3c9ffd

Browse files
KobzolKobzol
committed
Add is_msvc function
1 parent 42dfac5 commit b3c9ffd

File tree

9 files changed

+26
-23
lines changed

9 files changed

+26
-23
lines changed

‎src/bootstrap/src/core/build_steps/compile.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,7 @@ impl Step for Rustc {
870870
// is already on by default in MSVC optimized builds, which is interpreted as --icf=all:
871871
// https://github.com/llvm/llvm-project/blob/3329cec2f79185bafd678f310fafadba2a8c76d2/lld/COFF/Driver.cpp#L1746
872872
// https://github.com/rust-lang/rust/blob/f22819bcce4abaff7d1246a56eec493418f9f4ee/compiler/rustc_codegen_ssa/src/back/linker.rs#L827
873-
if builder.config.use_lld && !compiler.host.contains("msvc") {
873+
if builder.config.use_lld && !compiler.host.is_msvc() {
874874
cargo.rustflag("-Clink-args=-Wl,--icf=all");
875875
}
876876

@@ -1089,7 +1089,7 @@ fn rustc_llvm_env(builder: &Builder<'_>, cargo: &mut Cargo, target: TargetSelect
10891089
// found. This is to avoid the linker errors about undefined references to
10901090
// `__llvm_profile_instrument_memop` when linking `rustc_driver`.
10911091
let mut llvm_linker_flags = String::new();
1092-
if builder.config.llvm_profile_generate && target.contains("msvc") {
1092+
if builder.config.llvm_profile_generate && target.is_msvc() {
10931093
if let Some(ref clang_cl_path) = builder.config.llvm_clang_cl {
10941094
// Add clang's runtime library directory to the search path
10951095
let clang_rt_dir = get_clang_cl_resource_dir(clang_cl_path);
@@ -1114,7 +1114,7 @@ fn rustc_llvm_env(builder: &Builder<'_>, cargo: &mut Cargo, target: TargetSelect
11141114
// not for MSVC or macOS
11151115
if builder.config.llvm_static_stdcpp
11161116
&& !target.contains("freebsd")
1117-
&& !target.contains("msvc")
1117+
&& !target.is_msvc()
11181118
&& !target.contains("apple")
11191119
&& !target.contains("solaris")
11201120
{

‎src/bootstrap/src/core/build_steps/llvm.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ pub fn prebuilt_llvm_config(
9898
let out_dir = builder.llvm_out(target);
9999

100100
let mut llvm_config_ret_dir = builder.llvm_out(builder.config.build);
101-
if !builder.config.build.contains("msvc") || builder.ninja() {
101+
if !builder.config.build.is_msvc() || builder.ninja() {
102102
llvm_config_ret_dir.push("build");
103103
}
104104
llvm_config_ret_dir.push("bin");
@@ -411,7 +411,7 @@ impl Step for Llvm {
411411
ldflags.shared.push(" -latomic");
412412
}
413413

414-
if target.contains("msvc") {
414+
if target.is_msvc() {
415415
cfg.define("LLVM_USE_CRT_DEBUG", "MT");
416416
cfg.define("LLVM_USE_CRT_RELEASE", "MT");
417417
cfg.define("LLVM_USE_CRT_RELWITHDEBINFO", "MT");
@@ -644,7 +644,7 @@ fn configure_cmake(
644644
}
645645

646646
let sanitize_cc = |cc: &Path| {
647-
if target.contains("msvc") {
647+
if target.is_msvc() {
648648
OsString::from(cc.to_str().unwrap().replace("\\", "/"))
649649
} else {
650650
cc.as_os_str().to_owned()
@@ -654,7 +654,7 @@ fn configure_cmake(
654654
// MSVC with CMake uses msbuild by default which doesn't respect these
655655
// vars that we'd otherwise configure. In that case we just skip this
656656
// entirely.
657-
if target.contains("msvc") && !builder.ninja() {
657+
if target.is_msvc() && !builder.ninja() {
658658
return;
659659
}
660660

@@ -664,7 +664,7 @@ fn configure_cmake(
664664
};
665665

666666
// Handle msvc + ninja + ccache specially (this is what the bots use)
667-
if target.contains("msvc") && builder.ninja() && builder.config.ccache.is_some() {
667+
if target.is_msvc() && builder.ninja() && builder.config.ccache.is_some() {
668668
let mut wrap_cc = env::current_exe().expect("failed to get cwd");
669669
wrap_cc.set_file_name("sccache-plus-cl.exe");
670670

@@ -768,7 +768,7 @@ fn configure_cmake(
768768
// For distribution we want the LLVM tools to be *statically* linked to libstdc++.
769769
// We also do this if the user explicitly requested static libstdc++.
770770
if builder.config.llvm_static_stdcpp
771-
&& !target.contains("msvc")
771+
&& !target.is_msvc()
772772
&& !target.contains("netbsd")
773773
&& !target.contains("solaris")
774774
{
@@ -874,7 +874,7 @@ impl Step for Lld {
874874
// when doing PGO on CI, cmake or clang-cl don't automatically link clang's
875875
// profiler runtime in. In that case, we need to manually ask cmake to do it, to avoid
876876
// linking errors, much like LLVM's cmake setup does in that situation.
877-
if builder.config.llvm_profile_generate && target.contains("msvc") {
877+
if builder.config.llvm_profile_generate && target.is_msvc() {
878878
if let Some(clang_cl_path) = builder.config.llvm_clang_cl.as_ref() {
879879
// Find clang's runtime library directory and push that as a search path to the
880880
// cmake linker flags.

‎src/bootstrap/src/core/build_steps/test.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1931,7 +1931,7 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
19311931
//
19321932
// Note that if we encounter `PATH` we make sure to append to our own `PATH`
19331933
// rather than stomp over it.
1934-
if !builder.config.dry_run() && target.contains("msvc") {
1934+
if !builder.config.dry_run() && target.is_msvc() {
19351935
for &(ref k, ref v) in builder.cc.borrow()[&target].env() {
19361936
if k != "PATH" {
19371937
cmd.env(k, v);
@@ -3070,7 +3070,7 @@ impl Step for TestHelpers {
30703070
// We may have found various cross-compilers a little differently due to our
30713071
// extra configuration, so inform cc of these compilers. Note, though, that
30723072
// on MSVC we still need cc's detection of env vars (ugh).
3073-
if !target.contains("msvc") {
3073+
if !target.is_msvc() {
30743074
if let Some(ar) = builder.ar(target) {
30753075
cfg.archiver(ar);
30763076
}

‎src/bootstrap/src/core/build_steps/tool.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -833,7 +833,7 @@ impl<'a> Builder<'a> {
833833
// On MSVC a tool may invoke a C compiler (e.g., compiletest in run-make
834834
// mode) and that C compiler may need some extra PATH modification. Do
835835
// so here.
836-
if compiler.host.contains("msvc") {
836+
if compiler.host.is_msvc() {
837837
let curpaths = env::var_os("PATH").unwrap_or_default();
838838
let curpaths = env::split_paths(&curpaths).collect::<Vec<_>>();
839839
for &(ref k, ref v) in self.cc.borrow()[&compiler.host].env() {

‎src/bootstrap/src/core/builder.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1729,8 +1729,7 @@ impl<'a> Builder<'a> {
17291729

17301730
let split_debuginfo_is_stable = target.contains("linux")
17311731
|| target.contains("apple")
1732-
|| (target.contains("msvc")
1733-
&& self.config.rust_split_debuginfo == SplitDebuginfo::Packed)
1732+
|| (target.is_msvc() && self.config.rust_split_debuginfo == SplitDebuginfo::Packed)
17341733
|| (target.contains("windows")
17351734
&& self.config.rust_split_debuginfo == SplitDebuginfo::Off);
17361735

@@ -1909,7 +1908,7 @@ impl<'a> Builder<'a> {
19091908
// the options through environment variables that are fetched and understood by both.
19101909
//
19111910
// FIXME: the guard against msvc shouldn't need to be here
1912-
if target.contains("msvc") {
1911+
if target.is_msvc() {
19131912
if let Some(ref cl) = self.config.llvm_clang_cl {
19141913
cargo.env("CC", cl).env("CXX", cl);
19151914
}

‎src/bootstrap/src/core/config/config.rs

+4
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,10 @@ impl TargetSelection {
489489
pub fn is_synthetic(&self) -> bool {
490490
self.synthetic
491491
}
492+
493+
pub fn is_msvc(&self) -> bool {
494+
self.contains("msvc")
495+
}
492496
}
493497

494498
impl fmt::Display for TargetSelection {

‎src/bootstrap/src/core/sanity.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ than building it.
237237
}
238238
}
239239

240-
if need_cmake && target.contains("msvc") {
240+
if need_cmake && target.is_msvc() {
241241
// There are three builds of cmake on windows: MSVC, MinGW, and
242242
// Cygwin. The Cygwin build does not have generators for Visual
243243
// Studio, so detect that here and error.

‎src/bootstrap/src/lib.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -862,7 +862,7 @@ impl Build {
862862
}
863863
} else {
864864
let base = self.llvm_out(target).join("build");
865-
let base = if !self.ninja() && target.contains("msvc") {
865+
let base = if !self.ninja() && target.is_msvc() {
866866
if self.config.llvm_optimize {
867867
if self.config.llvm_release_debuginfo {
868868
base.join("RelWithDebInfo")
@@ -1255,7 +1255,7 @@ impl Build {
12551255
Some(self.cxx.borrow()[&target].path().into())
12561256
} else if target != self.config.build
12571257
&& helpers::use_host_linker(target)
1258-
&& !target.contains("msvc")
1258+
&& !target.is_msvc()
12591259
{
12601260
Some(self.cc(target))
12611261
} else if self.config.use_lld && !self.is_fuse_ld_lld(target) && self.build == target {
@@ -1268,7 +1268,7 @@ impl Build {
12681268
// LLD is used through `-fuse-ld=lld` rather than directly.
12691269
// Only MSVC targets use LLD directly at the moment.
12701270
fn is_fuse_ld_lld(&self, target: TargetSelection) -> bool {
1271-
self.config.use_lld && !target.contains("msvc")
1271+
self.config.use_lld && !target.is_msvc()
12721272
}
12731273

12741274
fn lld_flags(&self, target: TargetSelection) -> impl Iterator<Item = String> {
@@ -1764,7 +1764,7 @@ to download LLVM rather than building it.
17641764
// In these cases we automatically enable Ninja if we find it in the
17651765
// environment.
17661766
if !self.config.ninja_in_file
1767-
&& self.config.build.contains("msvc")
1767+
&& self.config.build.is_msvc()
17681768
&& cmd_finder.maybe_have("ninja").is_some()
17691769
{
17701770
return true;

‎src/bootstrap/src/utils/cc_detect.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ fn cc2ar(cc: &Path, target: TargetSelection) -> Option<PathBuf> {
3939
Some(PathBuf::from(ar))
4040
} else if let Some(ar) = env::var_os("AR") {
4141
Some(PathBuf::from(ar))
42-
} else if target.contains("msvc") {
42+
} else if target.is_msvc() {
4343
None
4444
} else if target.contains("musl") {
4545
Some(PathBuf::from("ar"))
@@ -78,7 +78,7 @@ fn new_cc_build(build: &Build, target: TargetSelection) -> cc::Build {
7878
cfg.static_crt(a);
7979
}
8080
None => {
81-
if target.contains("msvc") {
81+
if target.is_msvc() {
8282
cfg.static_crt(true);
8383
}
8484
if target.contains("musl") {

0 commit comments

Comments
 (0)