Merge pull request #6266 from ladyada/main

msys at least breaks elsewhere now

mpy-cross/mpy-cross.mk

@@ -6,12 +6,7 @@ include ../py/mkenv.mk
 
 # define main target
 
-ifeq ($(OS),Windows_NT)
-# Detect a MINGW32 build, and change the name of the final executable.
-PROG ?= mpy-cross.exe
-else
 PROG ?= mpy-cross
-endif
 
 # qstr definitions (must come before including py.mk)
 QSTR_DEFS = qstrdefsport.h

py/makeversionhdr.py

@@ -19,16 +19,14 @@ def get_version_info_from_git():
     # Note: git describe doesn't work if no tag is available
     try:
         git_tag = subprocess.check_output(
-            [tools_describe],
-            stderr=subprocess.STDOUT,
-            universal_newlines=True,
+            [tools_describe], stderr=subprocess.STDOUT, universal_newlines=True, shell=True
         ).strip()
     except subprocess.CalledProcessError as er:
         if er.returncode == 128:
             # git exit code of 128 means no repository found
             return None
         git_tag = ""
-    except OSError:
+    except OSError as e:
         return None
     try:
         git_hash = subprocess.check_output(