Commits

Anonymous committed c490566

detect default CMTCONFIG (w/o any tampering from atlas environment)

  • Participants
  • Parent commits cac5c78

Comments (0)

Files changed (2)

Binary file modified.

wafflelib/waffle.py

 def configure_cmtcfg(ctx):
     g_module = waflib.Context.g_module
     g_module.WAFFLE_CMTCFG = ctx.env.CMTCFG
-    if ctx.env.CMTCFG == 'default':
+    if ctx.env.CMTCFG in ('default', 'Darwin', 'Linux', 'Windows'):
         msg.debug('detecting default CMTCFG...')
         mana_arch = 'x86_64'
         mana_os = 'linux'
     
     ctx.env.WAFFLE_CMTCFG = ctx.env.CMTCFG
     o = ctx.env.WAFFLE_CMTCFG.split('-')
-    assert len(o) == 4, "invalid CMTCFG: [%s]" % ctx.env.CMTCFG
+    assert len(o) == 4, \
+        "Invalid CMTCFG (%s). Expected ARCH-OS-COMP-OPT. ex: x86_64-linux-gcc-opt" % ctx.env.CMTCFG
     
     if o[1].startswith('mac'):
         o[1] = 'darwin'