rtems/rtems-source-builder
1
0
Fork 0
mirror of https://git.rtems.org/rtems-source-builder synced 2024-10-09 07:15:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

sb: bootstrap.py clearing of environ var 'ACLOCAL_PATH' on MSYS2 fails.

Browse Source 
With a recent (Feb 2016) pytnon on MSYS2 the clear fails so delete
the variable.

Update #2613.
This commit is contained in:
Chris Johns 2016-02-29 10:13:11 +11:00
parent e0fab0a504
commit 01ac76f2f9
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source-builder/sb/bootstrap.py
View File

@ -1,6 +1,6 @@
# #
# RTEMS Tools Project (http://www.rtems.org/) # RTEMS Tools Project (http://www.rtems.org/)
# Copyright 2013 Chris Johns (chrisj@rtems.org) # Copyright 2013-2016 Chris Johns (chrisj@rtems.org)
# All rights reserved. # All rights reserved.
# #
# This file is part of the RTEMS Tools package in 'rtems-tools'. # This file is part of the RTEMS Tools package in 'rtems-tools'.
@ -255,7 +255,14 @@ def run(args):
if 'msys' in cspath[0] and cspath[0].endswith('bin'): if 'msys' in cspath[0] and cspath[0].endswith('bin'):
os.environ['PATH'] = os.pathsep.join(cspath[1:]) os.environ['PATH'] = os.pathsep.join(cspath[1:])
if 'ACLOCAL_PATH' in os.environ: if 'ACLOCAL_PATH' in os.environ:
#
# The clear fails on a current MSYS2 python (Feb 2016). Delete
# the entry if the clear fails.
#
try:
os.environ['ACLOCAL_PATH'].clear() os.environ['ACLOCAL_PATH'].clear()
except:
del os.environ['ACLOCAL_PATH']
optargs = { '--rtems': 'The RTEMS source directory', optargs = { '--rtems': 'The RTEMS source directory',
'--preinstall': 'Preinstall AM generation' } '--preinstall': 'Preinstall AM generation' }
log.notice('RTEMS Source Builder - RTEMS Bootstrap, %s' % (version.str())) log.notice('RTEMS Source Builder - RTEMS Bootstrap, %s' % (version.str()))