A fix was added for setting LD_LIBRARY_PATH in the qt3 build, but if LD_LIBRARY_PATH is not set the qt build fails. So so check and set LD_LIBRARY_PATH if not set, update if it is set.
This commit is contained in:
parent
adbaed5d4b
commit
60d58613ed
@ -227,7 +227,13 @@ def common_config_args(self):
|
||||
@when('@3')
|
||||
def configure(self):
|
||||
# A user reported that this was necessary to link Qt3 on ubuntu
|
||||
os.environ['LD_LIBRARY_PATH'] += os.pathsep + os.getcwd() + '/lib'
|
||||
# However, if LD_LIBRARY_PATH is not set the qt build fails, so check
|
||||
# and set LD_LIBRARY_PATH if not set, update if it is set.
|
||||
if not os.environ.get('LD_LIBRARY_PATH'):
|
||||
os.environ['LD_LIBRARY_PATH'] = os.pathsep + os.getcwd() + '/lib'
|
||||
else:
|
||||
os.environ['LD_LIBRARY_PATH'] += os.pathsep + os.getcwd() + '/lib'
|
||||
|
||||
configure('-prefix', self.prefix,
|
||||
'-v',
|
||||
'-thread',
|
||||
|
Loading…
Reference in New Issue
Block a user