diff options
Diffstat (limited to 'waftools/checks')
| -rw-r--r-- | waftools/checks/custom.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/waftools/checks/custom.py b/waftools/checks/custom.py index 03f8335279..f070141a23 100644 --- a/waftools/checks/custom.py +++ b/waftools/checks/custom.py @@ -76,12 +76,14 @@ def __fail_oss_check__(ctx): return False def __get_osslibdir__(): + from waflib import Utils + try: - cmd = ['sh', '-c', "'source /etc/oss.conf && echo $OSSLIBDIR'"] + cmd = ['sh', '-c', '. /etc/oss.conf && echo $OSSLIBDIR'] p = Utils.subprocess.Popen(cmd, stdin=Utils.subprocess.PIPE, stdout=Utils.subprocess.PIPE, stderr=Utils.subprocess.PIPE) - return p.communicate()[0] + return p.communicate()[0].rstrip() except Exception: return "" |