[llvm-commits] [hlvm] r38089 - /hlvm/trunk/build/configure.py
Reid Spencer
reid at x10sys.com
Sat Jul 7 16:59:44 PDT 2007
Author: reid
Date: Sat Jul 7 18:59:44 2007
New Revision: 38089
URL: http://llvm.org/viewvc/llvm-project?rev=38089&view=rev
Log:
Fix a bug where multiple libs passed to AskForDirs were not being handled
properly.
Modified:
hlvm/trunk/build/configure.py
Modified: hlvm/trunk/build/configure.py
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/build/configure.py?rev=38089&r1=38088&r2=38089&view=diff
==============================================================================
--- hlvm/trunk/build/configure.py (original)
+++ hlvm/trunk/build/configure.py Sat Jul 7 18:59:44 2007
@@ -16,7 +16,7 @@
return ret
-def AskForDirs(context,pkgname,hdr,lib):
+def AskForDirs(context,pkgname,hdr,libs):
hdrdir = _getline(context.env,
'Enter directory containing %(name)s headers: ' % {'name':pkgname }
)
@@ -25,20 +25,21 @@
libdir = _getline(context.env,
'Enter directory containing %(name)s libraries: ' % { 'name':pkgname }
)
- libpath = pjoin(libdir,context.env['LIBPREFIX'])
- libpath += lib
- libpath += context.env['LIBSUFFIX']
- if isfile(libpath):
- context.env[pkgname + '_lib'] = libdir
- context.env[pkgname + '_inc'] = hdrdir
- context.env.AppendUnique(LIBPATH=[libdir],CPPPATH=[hdrdir])
- return 1
- else:
- print "Didn't find ",pkgname," libraries in ",libpath,". Try again."
- return AskForDirs(context,pkgname,hdr,lib)
+ for lib in libs:
+ libpath = pjoin(libdir,context.env['LIBPREFIX'])
+ libpath += lib
+ libpath += context.env['LIBSUFFIX']
+ if isfile(libpath):
+ context.env[pkgname + '_lib'] = libdir
+ context.env[pkgname + '_inc'] = hdrdir
+ context.env.AppendUnique(LIBPATH=[libdir],CPPPATH=[hdrdir])
+ return 1
+ else:
+ print "Didn't find ",pkgname," libraries in ",libpath,". Try again."
+ return AskForDirs(context,pkgname,hdr,libs)
else:
print "Didn't find ",pkgname," headers in ",hdrpath,". Try again."
- return AskForDirs(context,pkgname,hdr,lib)
+ return AskForDirs(context,pkgname,hdr,libs)
def FindPackage(context,pkgname,hdr,libs,code='main(argc,argv);',paths=[],
objs=[], hdrpfx=''):
@@ -56,8 +57,9 @@
}
"""
context.env.AppendUnique(LIBS = libs)
- paths +=
- ['/proj','/proj/install','/opt/local','/opt/','/sw','/usr/local','/usr','/']
+ paths += [
+ '/proj','/proj/install','/opt/local','/opt/','/sw','/usr/local','/usr','/'
+ ]
for p in paths:
for ldir in ['lib','bin','libexec','libs','LIBS']:
libdir = pjoin(p,ldir)
More information about the llvm-commits
mailing list