From 022f0aa34a6b8688e816ff0c3ecbf970fc210cf7 Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Fri, 14 Apr 2017 23:56:59 -0400 Subject: Remove more deprecated Windows GNU code/docs --- python/servo/command_base.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'python/servo/command_base.py') diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 2dbeff53bfb..ba91bcc3e74 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -168,8 +168,7 @@ def check_call(*args, **kwargs): def is_windows(): - """ Detect windows, mingw, cygwin """ - return sys.platform == 'win32' or sys.platform == 'msys' or sys.platform == 'cygwin' + return sys.platform == 'win32' def is_macosx(): @@ -420,9 +419,6 @@ class CommandBase(object): if not self.config["tools"]["system-rust"] \ or self.config["tools"]["rust-root"]: env["RUST_ROOT"] = self.config["tools"]["rust-root"] - # Add mingw64 binary path before rust paths to avoid conflict with libstdc++-6.dll - if sys.platform == "msys": - extra_path += [path.join(os.sep, "mingw64", "bin")] # These paths are for when rust-root points to an unpacked installer extra_path += [path.join(self.config["tools"]["rust-root"], "rustc", "bin")] extra_lib += [path.join(self.config["tools"]["rust-root"], "rustc", "lib")] @@ -489,7 +485,7 @@ class CommandBase(object): env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " " + self.config["build"]["rustflags"] # Don't run the gold linker if on Windows https://github.com/servo/servo/issues/9499 - if self.config["tools"]["rustc-with-gold"] and sys.platform not in ("win32", "msys"): + if self.config["tools"]["rustc-with-gold"] and sys.platform != "win32": if subprocess.call(['which', 'ld.gold'], stdout=PIPE, stderr=PIPE) == 0: env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " -C link-args=-fuse-ld=gold" -- cgit v1.2.3