add more directories to implicit link exclusion
This commit is contained in:
parent
ace3753076
commit
7ea94d1103
@ -274,15 +274,20 @@ def initconfig_hardware_entries(self):
|
|||||||
# Fix for working around CMake adding implicit link directories
|
# Fix for working around CMake adding implicit link directories
|
||||||
# returned by the BlueOS compilers to link executables with
|
# returned by the BlueOS compilers to link executables with
|
||||||
# non-system default stdlib
|
# non-system default stdlib
|
||||||
_gcc_prefix = "/usr/tce/packages/gcc/gcc-4.9.3/lib64"
|
_roots = ["/usr/tce/packages/gcc/gcc-4.9.3",
|
||||||
if os.path.exists(_gcc_prefix):
|
"/usr/tce/packages/gcc/gcc-4.9.3/gnu"]
|
||||||
_gcc_prefix2 = pjoin(
|
_subdirs = ["lib64",
|
||||||
_gcc_prefix,
|
"lib64/gcc/powerpc64le-unknown-linux-gnu/4.9.3"]
|
||||||
"gcc/powerpc64le-unknown-linux-gnu/4.9.3")
|
_existing_paths = []
|
||||||
_link_dirs = "{0};{1}".format(_gcc_prefix, _gcc_prefix2)
|
for root in _roots:
|
||||||
|
for subdir in _subdirs:
|
||||||
|
_curr_path = pjoin(root, subdir)
|
||||||
|
if os.path.exists(_curr_path):
|
||||||
|
_existing_paths.append(_curr_path)
|
||||||
|
if _existing_paths:
|
||||||
entries.append(cmake_cache_string(
|
entries.append(cmake_cache_string(
|
||||||
"BLT_CMAKE_IMPLICIT_LINK_DIRECTORIES_EXCLUDE",
|
"BLT_CMAKE_IMPLICIT_LINK_DIRECTORIES_EXCLUDE",
|
||||||
_link_dirs))
|
";".join(_existing_paths)))
|
||||||
|
|
||||||
return entries
|
return entries
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user