/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2533 by jpye, Fri Jan 20 00:44:37 2012 UTC revision 2534 by jpye, Tue Jan 24 17:44:27 2012 UTC
# Line 775  if platform.system()=="Windows": Line 775  if platform.system()=="Windows":
775      tools += ['nsis']      tools += ['nsis']
776            
777      if os.environ.get('OSTYPE')=='msys' or os.environ.get('MSYSTEM'):      if os.environ.get('OSTYPE')=='msys' or os.environ.get('MSYSTEM'):
778          envenv = os.environ;          envenv = os.environ
779          tools += ['mingw']          tools += ['mingw']
780          envadditional['IS_MINGW']=True          envadditional['IS_MINGW']=True
781      else:      else:
# Line 823  vars.Save('options.cache',env) Line 823  vars.Save('options.cache',env)
823    
824  Help(vars.GenerateHelpText(env))  Help(vars.GenerateHelpText(env))
825    
826    if env['ENV'].get('HOST_PREFIX'):
827        triplet = re.compile("^[a-z0-9_]+-[a-z0-9_]+-[a-z0-9]+$")
828        if not triplet.match(env['ENV']['HOST_PREFIX']):
829            print "NOTE: invalid host triplet from environment variable HOST_PREFIX has been ignored"
830        else:
831            print "NOTE: using HOST_PREFIX=%s from environment to override HOST_PREFIX SCons variable" % env['ENV']['HOST_PREFIX']
832            env['HOST_PREFIX'] = env['ENV']['HOST_PREFIX']+"-"
833    
834  with_tcltk = env.get('WITH_TCLTK')  with_tcltk = env.get('WITH_TCLTK')
835  without_tcltk_reason = "disabled by options/config.py"  without_tcltk_reason = "disabled by options/config.py"
836    

Legend:
Removed from v.2533  
changed lines
  Added in v.2534

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22