/[ascend]/trunk/SConstruct
ViewVC logotype

Diff of /trunk/SConstruct

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

revision 1629 by jpye, Thu Sep 13 02:10:23 2007 UTC revision 1630 by jpye, Sun Sep 30 02:49:11 2007 UTC
# Line 754  def c_escape(str): Line 754  def c_escape(str):
754    
755  envadditional={}  envadditional={}
756    
757  tools = ['lex','yacc','fortran','swig','nsis','substinfile','disttar','tar']  tools = [
758        'lex', 'yacc','fortran', 'swig', 'nsis' ,'substinfile'
759        ,'disttar', 'tar'
760    ]
761  if platform.system()=="Windows":  if platform.system()=="Windows":
762      if os.environ.get('OSTYPE')=='msys' or os.environ.get('MSYSTEM'):      if os.environ.get('OSTYPE')=='msys' or os.environ.get('MSYSTEM'):
763          envenv = os.environ;          envenv = os.environ;
# Line 945  int main(void){ Line 948  int main(void){
948    
949  def CheckCXX(context):  def CheckCXX(context):
950      context.Message("Checking C++ compiler ('%s')... " % context.env.get('CXX'))      context.Message("Checking C++ compiler ('%s')... " % context.env.get('CXX'))
951      is_ok = context.TryCompile(cc_test_text,".cpp")      if not context.env.get('CXX'):
952            context.Result("not found")
953            return False
954        is_ok = context.TryCompile(cxx_test_text,".cpp")
955      context.Result(is_ok)      context.Result(is_ok)
956      return is_ok      return is_ok
957    
# Line 1872  if not conf.CheckCC(): Line 1878  if not conf.CheckCC():
1878  if not conf.CheckCXX():  if not conf.CheckCXX():
1879      print "Failed to build simple test file with your C++ compiler."      print "Failed to build simple test file with your C++ compiler."
1880      print "Check your compiler is installed and running correctly."      print "Check your compiler is installed and running correctly."
1881        print "You can set your C++ compiler using the CXX scons option."
1882      Exit(1)      Exit(1)
1883    
1884  # stdio -- just to check that compiler is behaving  # stdio -- just to check that compiler is behaving

Legend:
Removed from v.1629  
changed lines
  Added in v.1630

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