From 7071d6e73ab65ed3373f07ac4a4ab80460787b75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krystian=20Bac=C5=82awski?= <krystian.baclawski@gmail.com>
Date: Mon, 31 Aug 2015 08:29:07 +0200
Subject: [PATCH] Some minor fixes wrt. Cygwin.

---
 toolchain-dev  | 16 ++++++++++------
 toolchain-m68k | 19 +++++++++++--------
 toolchain-ppc  | 19 +++++++++++--------
 3 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/toolchain-dev b/toolchain-dev
index 72f718c..b865eb6 100755
--- a/toolchain-dev
+++ b/toolchain-dev
@@ -2,6 +2,7 @@
 
 # Build development cross toolchain for m68k-elf target.
 
+from fnmatch import fnmatch
 from os import environ
 import argparse
 import logging
@@ -128,12 +129,8 @@ def clean():
 if __name__ == "__main__":
   logging.basicConfig(level=logging.DEBUG, format='%(levelname)s: %(message)s')
 
-  parser = argparse.ArgumentParser(description='Build cross toolchain.')
-  parser.add_argument('action', choices=['make', 'clean'], default='make',
-                      help='perform action')
-  parser.add_argument('--prefix', type=str, default=None,
-                      help='installation directory')
-  args = parser.parse_args()
+  if not sys.version_info[:2] == (2, 7):
+    panic('I need Python 2.7 to run!')
 
   if not (platform.system() in ['Darwin', 'Linux'] or
           fnmatch(platform.system(), 'CYGWIN*')):
@@ -142,6 +139,13 @@ if __name__ == "__main__":
   if platform.machine() not in ['i686', 'x86_64']:
     panic('Build on %s architecture not supported!', platform.machine())
 
+  parser = argparse.ArgumentParser(description='Build cross toolchain.')
+  parser.add_argument('action', choices=['make', 'clean'], default='make',
+                      help='perform action')
+  parser.add_argument('--prefix', type=str, default=None,
+                      help='installation directory')
+  args = parser.parse_args()
+
   setvar(top=path.abspath('.'))
 
   setvar(gmp='gmp-5.1.3',
diff --git a/toolchain-m68k b/toolchain-m68k
index 2ff3521..ac531d9 100755
--- a/toolchain-m68k
+++ b/toolchain-m68k
@@ -2,6 +2,7 @@
 
 # Build cross toolchain for AmigaOS <= 3.9 / M68k target.
 
+from fnmatch import fnmatch
 from logging import info
 from os import environ
 import argparse
@@ -200,7 +201,6 @@ def make():
   find_executable('patch')
   find_executable('make')
   find_executable('git')
-  find_executable('svn')
 
   environ['PATH'] = ":".join([path.join('{target}', 'bin'),
                               path.join('{host}', 'bin'),
@@ -372,6 +372,16 @@ def clean():
 if __name__ == "__main__":
   logging.basicConfig(level=logging.DEBUG, format='%(levelname)s: %(message)s')
 
+  if not sys.version_info[:2] == (2, 7):
+    panic('I need Python 2.7 to run!')
+
+  if not (platform.system() in ['Darwin', 'Linux'] or
+          fnmatch(platform.system(), 'CYGWIN*')):
+    panic('Build on %s not supported!', platform.system())
+
+  if platform.machine() not in ['i686', 'x86_64']:
+    panic('Build on %s architecture not supported!', platform.machine())
+
   parser = argparse.ArgumentParser(description='Build cross toolchain.')
   parser.add_argument('action', choices=['make', 'clean'], default='make',
                       help='perform action')
@@ -383,13 +393,6 @@ if __name__ == "__main__":
                       help='installation directory')
   args = parser.parse_args()
 
-  if not (platform.system() in ['Darwin', 'Linux'] or
-          fnmatch(platform.system(), 'CYGWIN*')):
-    panic('Build on %s not supported!', platform.system())
-
-  if platform.machine() not in ['i686', 'x86_64']:
-    panic('Build on %s architecture not supported!', platform.machine())
-
   setvar(top=path.abspath(path.dirname(sys.argv[0])),
          binutils_ver=args.binutils,
          gcc_ver=args.gcc)
diff --git a/toolchain-ppc b/toolchain-ppc
index d6e75a8..df373a8 100755
--- a/toolchain-ppc
+++ b/toolchain-ppc
@@ -2,6 +2,7 @@
 
 # Build cross toolchain for AmigaOS 4.x / PowerPC target.
 
+from fnmatch import fnmatch
 from glob import glob
 from logging import info
 from os import environ
@@ -74,7 +75,6 @@ def make():
   find_executable('bison')
   find_executable('flex')
   find_executable('make')
-  find_executable('git')
   find_executable('svn')
 
   environ['PATH'] = ":".join([path.join('{target}', 'bin'),
@@ -196,6 +196,16 @@ def clean():
 if __name__ == "__main__":
   logging.basicConfig(level=logging.DEBUG, format='%(levelname)s: %(message)s')
 
+  if not sys.version_info[:2] == (2, 7):
+    panic('I need Python 2.7 to run!')
+
+  if not (platform.system() in ['Darwin', 'Linux'] or
+          fnmatch(platform.system(), 'CYGWIN*')):
+    panic('Build on %s not supported!', platform.system())
+
+  if platform.machine() not in ['i686', 'x86_64']:
+    panic('Build on %s architecture not supported!', platform.machine())
+
   parser = argparse.ArgumentParser(description='Build cross toolchain.')
   parser.add_argument('action', choices=['make', 'clean'], default='make',
                       help='perform action')
@@ -207,13 +217,6 @@ if __name__ == "__main__":
                       help='installation directory')
   args = parser.parse_args()
 
-  if not (platform.system() in ['Darwin', 'Linux'] or
-          fnmatch(platform.system(), 'CYGWIN*')):
-    panic('Build on %s not supported!', platform.system())
-
-  if platform.machine() not in ['i686', 'x86_64']:
-    panic('Build on %s architecture not supported!', platform.machine())
-
   setvar(top=path.abspath('.'),
          binutils_ver=args.binutils,
          gcc_ver=args.gcc)