Ticket #3227: rsb.diff

File rsb.diff, 1.6 KB (added by Joel Sherrill, on Nov 10, 2017 at 4:13:54 PM)

Accounts for name change

  • source-builder/sb/options.py

    diff --git a/source-builder/sb/options.py b/source-builder/sb/options.py
    index 7bbdd8c..847a75f 100644
    a b def load(args, optargs = None, defaults = '%{_sbdir}/defaults.mc', logfile = Tru 
    609609                                   sbdir = command_path),
    610610                     command_path)
    611611
     612    print("%s" % os.name)
    612613    overrides = None
    613614    if os.name == 'nt':
    614615        try:
    def load(args, optargs = None, defaults = '%{_sbdir}/defaults.mc', logfile = Tru 
    621622    elif os.name == 'posix':
    622623        uname = os.uname()
    623624        try:
     625            print("%s" % uname[0])
    624626            if uname[0].startswith('MINGW64_NT'):
    625627                import windows
    626628                overrides = windows.load()
    627629                host_windows = True
     630            if uname[0].startswith('MSYS_NT'):
     631                import windows
     632                overrides = windows.load()
     633                host_windows = True
    628634            elif uname[0].startswith('CYGWIN_NT'):
    629635                import windows
    630636                overrides = windows.load()
  • source-builder/sb/windows.py

    diff --git a/source-builder/sb/windows.py b/source-builder/sb/windows.py
    index f4eb85c..a958750 100644
    a b def load(): 
    5454        _uname = os.uname()
    5555        if _uname[0].startswith('MINGW'):
    5656            pass
     57        elif _uname[0].startswith('MSYS'):
     58            pass
    5759        elif _uname[0].startswith('CYGWIN'):
    5860            hosttype = _uname[4]
    5961            uname = 'cygwin'