|
44 | 44 |
|
45 | 45 | """
|
46 | 46 |
|
| 47 | +explain_LLVM_LINK_NAME = """ |
| 48 | +
|
| 49 | +If your llvm linker is not called llvm-link, but something else, then |
| 50 | +you will need to set the environment variable LLVM_LINK_NAME to the |
| 51 | +appropriate string. For example if your llvm-link is called llvm-link-3.5 then |
| 52 | +LLVM_LINK_NAME should be set to llvm-link-3.5. |
| 53 | +
|
| 54 | +""" |
| 55 | + |
| 56 | +explain_LLVM_AR_NAME = """ |
| 57 | +
|
| 58 | +If your llvm archiver is not called llvm-ar, but something else, |
| 59 | +then you will need to set the environment variable LLVM_AR_NAME to |
| 60 | +the appropriate string. For example if your llvm-ar is called llvm-ar-3.5 |
| 61 | +then LLVM_AR_NAME should be set to llvm-ar-3.5. |
| 62 | +
|
| 63 | +""" |
| 64 | + |
47 | 65 | class Checker(object):
|
48 | 66 | def __init__(self):
|
49 | 67 | path = os.getenv('LLVM_COMPILER_PATH')
|
@@ -192,20 +210,31 @@ def checkExecutable(self, exe, version_switch='-v'):
|
192 | 210 |
|
193 | 211 |
|
194 | 212 | def checkAuxiliaries(self):
|
195 |
| - link = '{0}llvm-link'.format(self.path) if self.path else 'llvm-link' #LLVM_LINKER_NAME |
196 |
| - ar = '{0}llvm-ar'.format(self.path) if self.path else 'llvm-ar' #LLVM_ARCHIVER_NAME |
| 213 | + link_name = os.getenv('LLVM_LINK_NAME') |
| 214 | + ar_name = os.getenv('LLVM_AR_NAME') |
| 215 | + |
| 216 | + if not link_name: |
| 217 | + link_name = 'llvm-link' |
| 218 | + |
| 219 | + if not ar_name: |
| 220 | + ar_name = 'llvm-ar' |
| 221 | + |
| 222 | + link = '{0}{1}'.format(self.path,link_name) if self.path else link_name |
| 223 | + ar = '{0}{1}'.format(self.path,ar_name) if self.path else ar_name |
197 | 224 |
|
198 | 225 | (linkOk, linkVersion) = self.checkExecutable(link, '-version')
|
199 | 226 |
|
200 | 227 | (arOk, arVersion) = self.checkExecutable(ar, '-version')
|
201 | 228 |
|
202 | 229 | if not linkOk:
|
203 | 230 | print 'The bitcode linker {0} was not found or not executable.\nBetter not try using extract-bc!\n'.format(link)
|
| 231 | + print explain_LLVM_LINK_NAME |
204 | 232 | else:
|
205 | 233 | print 'The bitcode linker {0} is:\n\n{1}\n'.format(link, linkVersion)
|
206 | 234 |
|
207 | 235 | if not arOk:
|
208 | 236 | print 'The bitcode archiver {0} was not found or not executable.\nBetter not try using extract-bc!\n'.format(ar)
|
| 237 | + print explain_LLVM_AR_NAME |
209 | 238 | else:
|
210 | 239 | print 'The bitcode archiver {0} is:\n\n{1}\n'.format(ar, arVersion)
|
211 | 240 |
|
|
0 commit comments