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
085ca7392b
commit
308db4c6e8
@ -227,10 +227,12 @@ def common_config_args(self):
|
|||||||
@when('@3')
|
@when('@3')
|
||||||
def configure(self):
|
def configure(self):
|
||||||
# A user reported that this was necessary to link Qt3 on ubuntu
|
# A user reported that this was necessary to link Qt3 on ubuntu
|
||||||
# The previous change tried to append to LD_LIBRARY_PATH, but since
|
# However, if LD_LIBRARY_PATH is not set the qt build fails, so check
|
||||||
# spack clears LD_LIBRARY_PATH do not append to the LD_LIBRARY_PATH
|
# and set LD_LIBRARY_PATH if not set, update if it is set.
|
||||||
# instead set LD_LIBRARY_PATH.
|
if not os.environ.get('LD_LIBRARY_PATH'):
|
||||||
os.environ['LD_LIBRARY_PATH'] = os.pathsep + os.getcwd() + '/lib'
|
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,
|
configure('-prefix', self.prefix,
|
||||||
'-v',
|
'-v',
|
||||||
|
Loading…
Reference in New Issue
Block a user