From 6b6a7a4691e5e0b3285bd7fc3ceb40ca6ce3bd84 Mon Sep 17 00:00:00 2001 From: ljedrz Date: Mon, 9 Jul 2018 15:28:12 +0200 Subject: [PATCH 1/2] Warn windows-gnu users that the bundled gcc can't compile --- src/bootstrap/dist.rs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 0587dc8896d..3343ef89d7b 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -308,6 +308,14 @@ fn make_win_dist( builder.copy_to_folder(&src, &target_bin_dir); } + // Warn windows-gnu users that the bundled GCC cannot compile C files + builder.create( + &target_bin_dir.join("DO NOT USE THIS gcc.exe FOR COMPILATION.txt"), + &"gcc.exe contained in this folder cannot be used for compiling C files - it is only\ + used as a linker. In order to be able to compile projects containing C code use\ + the GCC provided by MinGW or Cygwin." + ); + //Copy platform libs to platform-specific lib directory let target_lib_dir = plat_root.join("lib").join("rustlib").join(target_triple).join("lib"); fs::create_dir_all(&target_lib_dir).expect("creating target_lib_dir failed"); From 232e77e007eb9ec847f1737cd200102e2c309cf7 Mon Sep 17 00:00:00 2001 From: ljedrz Date: Mon, 9 Jul 2018 21:25:16 +0200 Subject: [PATCH 2/2] Change gcc warning file name, remove unnecessary reference --- src/bootstrap/dist.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 3343ef89d7b..e4fbabdf231 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -310,8 +310,8 @@ fn make_win_dist( // Warn windows-gnu users that the bundled GCC cannot compile C files builder.create( - &target_bin_dir.join("DO NOT USE THIS gcc.exe FOR COMPILATION.txt"), - &"gcc.exe contained in this folder cannot be used for compiling C files - it is only\ + &target_bin_dir.join("GCC-WARNING.txt"), + "gcc.exe contained in this folder cannot be used for compiling C files - it is only\ used as a linker. In order to be able to compile projects containing C code use\ the GCC provided by MinGW or Cygwin." );