Add TargetSelection::is_windows method

Author: Kobzol

src/bootstrap/src/core/build_steps/dist.rs

@@ -1319,7 +1319,7 @@ impl Step for CodegenBackend {
 returnNone;
 }
 
-ifself.compiler.host.contains("windows"){
+ifself.compiler.host.is_windows(){
  builder.info(
 "dist currently disabled for windows by rustc_codegen_cranelift. skipping",
 );
@@ -1658,7 +1658,7 @@ impl Step for Extended {
  builder.run(&mut cmd);
 }
 
-if target.contains("windows"){
+if target.is_windows(){
 let exe = tmp.join("exe");
 let _ = fs::remove_dir_all(&exe);
 

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

@@ -283,7 +283,7 @@ impl Step for Llvm {
 };
 
  builder.update_submodule(&Path::new("src").join("llvm-project"));
-if builder.llvm_link_shared() && target.contains("windows"){
+if builder.llvm_link_shared() && target.is_windows(){
 panic!("shared linking to LLVM is not currently supported on {}", target.triple);
 }
 
@@ -361,7 +361,7 @@ impl Step for Llvm {
 // Disable zstd to avoid a dependency on libzstd.so.
  cfg.define("LLVM_ENABLE_ZSTD","OFF");
 
-if !target.contains("windows"){
+if !target.is_windows(){
  cfg.define("LLVM_ENABLE_ZLIB","ON");
 }else{
  cfg.define("LLVM_ENABLE_ZLIB","OFF");
@@ -607,7 +607,7 @@ fn configure_cmake(
  cfg.define("CMAKE_SYSTEM_NAME","DragonFly");
 }elseif target.contains("freebsd"){
  cfg.define("CMAKE_SYSTEM_NAME","FreeBSD");
-}elseif target.contains("windows"){
+}elseif target.is_windows(){
  cfg.define("CMAKE_SYSTEM_NAME","Windows");
 }elseif target.contains("haiku"){
  cfg.define("CMAKE_SYSTEM_NAME","Haiku");
@@ -772,7 +772,7 @@ fn configure_cmake(
  && !target.contains("netbsd")
  && !target.contains("solaris")
 {
-if target.contains("apple") || target.contains("windows"){
+if target.contains("apple") || target.is_windows(){
  ldflags.push_all("-static-libstdc++");
 }else{
  ldflags.push_all("-Wl,-Bsymbolic -static-libstdc++");
@@ -1295,7 +1295,7 @@ impl Step for Libunwind {
  cfg.define("__LIBUNWIND_IS_NATIVE_ONLY",None);
  cfg.define("NDEBUG",None);
 }
-ifself.target.contains("windows"){
+ifself.target.is_windows(){
  cfg.define("_LIBUNWIND_HIDE_SYMBOLS","1");
  cfg.define("_LIBUNWIND_IS_NATIVE_ONLY","1");
 }

src/bootstrap/src/core/builder.rs

@@ -1653,10 +1653,7 @@ impl<'a> Builder<'a> {
 // flesh out rpath support more fully in the future.
  rustflags.arg("-Zosx-rpath-install-name");
 Some(format!("-Wl,-rpath,@loader_path/../{libdir}"))
-}elseif !target.contains("windows")
- && !target.contains("aix")
- && !target.contains("xous")
-{
+}elseif !target.is_windows() && !target.contains("aix") && !target.contains("xous"){
  rustflags.arg("-Clink-args=-Wl,-z,origin");
 Some(format!("-Wl,-rpath,$ORIGIN/../{libdir}"))
 }else{
@@ -1729,8 +1726,7 @@ impl<'a> Builder<'a> {
 let split_debuginfo_is_stable = target.contains("linux")
  || target.contains("apple")
  || (target.is_msvc() && self.config.rust_split_debuginfo == SplitDebuginfo::Packed)
- || (target.contains("windows")
- && self.config.rust_split_debuginfo == SplitDebuginfo::Off);
+ || (target.is_windows() && self.config.rust_split_debuginfo == SplitDebuginfo::Off);
 
 if !split_debuginfo_is_stable {
  rustflags.arg("-Zunstable-options");

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

@@ -421,10 +421,10 @@ impl std::str::FromStr for SplitDebuginfo {
 implSplitDebuginfo{
 /// Returns the default `-Csplit-debuginfo` value for the current target. See the comment for
 /// `rust.split-debuginfo` in `config.example.toml`.
-fndefault_for_platform(target:&str) -> Self{
+fndefault_for_platform(target:TargetSelection) -> Self{
 if target.contains("apple"){
 SplitDebuginfo::Unpacked
-}elseif target.contains("windows"){
+}elseif target.is_windows(){
 SplitDebuginfo::Packed
 }else{
 SplitDebuginfo::Off
@@ -527,6 +527,10 @@ impl TargetSelection {
 pubfnis_msvc(&self) -> bool{
 self.contains("msvc")
 }
+
+pubfnis_windows(&self) -> bool{
+self.contains("windows")
+}
 }
 
 impl fmt::DisplayforTargetSelection{
@@ -1595,7 +1599,7 @@ impl Config {
 .as_deref()
 .map(SplitDebuginfo::from_str)
 .map(|v| v.expect("invalid value for rust.split_debuginfo"))
-.unwrap_or(SplitDebuginfo::default_for_platform(&config.build.triple));
+.unwrap_or(SplitDebuginfo::default_for_platform(config.build));
  optimize = optimize_toml;
  omit_git_hash = omit_git_hash_toml;
  config.rust_new_symbol_mangling = new_symbol_mangling;

src/bootstrap/src/utils/helpers.rs

@@ -49,7 +49,7 @@ pub use t;
 /// Given an executable called `name`, return the filename for the
 /// executable for a particular target.
 pubfnexe(name:&str,target:TargetSelection) -> String{
-if target.contains("windows"){
+if target.is_windows(){
 format!("{name}.exe")
 }elseif target.contains("uefi"){
 format!("{name}.efi")
@@ -72,7 +72,7 @@ pub fn is_debug_info(name: &str) -> bool {
 /// Returns the corresponding relative library directory that the compiler's
 /// dylibs will be found in.
 pubfnlibdir(target:TargetSelection) -> &'staticstr{
-if target.contains("windows"){"bin"}else{"lib"}
+if target.is_windows(){"bin"}else{"lib"}
 }
 
 /// Adds a list of lookup paths to `cmd`'s dynamic library lookup path.
@@ -191,7 +191,7 @@ pub fn target_supports_cranelift_backend(target: TargetSelection) -> bool {
  || target.contains("aarch64")
  || target.contains("s390x")
  || target.contains("riscv64gc")
-}elseif target.contains("darwin") || target.contains("windows"){
+}elseif target.contains("darwin") || target.is_windows(){
  target.contains("x86_64")
 }else{
 false