[llvm-commits] [hlvm] r38086 - in /hlvm/trunk/build: configure.py hlvm.py

[Reid Spencer]

Author: reid
Date: Sat Jul  7 18:59:42 2007
New Revision: 38086

URL: http://llvm.org/viewvc/llvm-project?rev=38086&view=rev
Log:
Don't commit debug printout!
Add some default dirs to apr and apr-util

Modified:
    hlvm/trunk/build/configure.py
    hlvm/trunk/build/hlvm.py

Modified: hlvm/trunk/build/configure.py
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/build/configure.py?rev=38086&r1=38085&r2=38086&view=diff

==============================================================================
--- hlvm/trunk/build/configure.py (original)
+++ hlvm/trunk/build/configure.py Sat Jul  7 18:59:42 2007
@@ -123,12 +123,13 @@
 
 def FindAPR(conf,env):
   code = 'apr_initialize();'
-  return conf.FindPackage('APR',pjoin('apr-1','apr_general.h'),['apr-1'],code)
+  return conf.FindPackage('APR',pjoin('apr-1','apr_general.h'),['apr-1'],code,
+      ['/usr/local/apr'])
 
 def FindAPRU(conf,env):
   code = 'apu_version_string();'
   return conf.FindPackage('APRU',pjoin('apr-1','apu_version.h'),['aprutil-1'],
-      code)
+      code,['/usr/local/apr'])
 
 def FindLibXML2(conf,env):
   code = 'xmlNewParserCtxt();'

Modified: hlvm/trunk/build/hlvm.py
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/build/hlvm.py?rev=38086&r1=38085&r2=38086&view=diff

==============================================================================
--- hlvm/trunk/build/hlvm.py (original)
+++ hlvm/trunk/build/hlvm.py Sat Jul  7 18:59:42 2007
@@ -27,12 +27,10 @@
 
 def Dirs(env,dirlist=[]):
   dir = env.Dir('.').path
-  print "dir=",dir
   if (dir == env.Dir('#').path):
     dir = '#' + env['BuildDir']
   else:
     dir = '#' + dir
-  print "dir=",dir
   for d in dirlist:
     sconsfile = pjoin(dir,d,'SConscript')
     print "sconsfile=",sconsfile