-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
e94f8b3
commit 7d6356c
Showing
1 changed file
with
4 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -222,7 +222,7 @@ def usage(msg, code=-1): | |
ISISROOT = P.join(INSTALLDIR) | ||
SEARCHPATH = [INSTALLDIR.lib(), | ||
opt.asp_deps_dir + '/lib', | ||
opt.asp_deps_dir + '/lib/csmplugins/', | ||
opt.asp_deps_dir + '/lib/csmplugins', | ||
opt.asp_deps_dir + '/x86_64-conda-linux-gnu/sysroot/usr/lib64', | ||
opt.asp_deps_dir + '/lib/pulseaudio', | ||
'/usr/lib/x86_64-linux-gnu', '/usr/lib', '/opt/X11/lib'] | ||
|
@@ -348,7 +348,8 @@ def usage(msg, code=-1): | |
|
||
print('\tFinding deps in search path') | ||
sys.stdout.flush() | ||
mgr.resolve_deps(nocopy = [P.join(ISISROOT, 'lib'), P.join(ISISROOT, '3rdParty', 'lib')], | ||
mgr.resolve_deps(nocopy = [P.join(ISISROOT, 'lib'), | ||
P.join(ISISROOT, '3rdParty', 'lib')], | ||
copy = SEARCHPATH + \ | ||
['/opt/X11/lib', | ||
'/usr/lib', | ||
|
@@ -360,6 +361,7 @@ def usage(msg, code=-1): | |
'/usr/lib/x86_64-linux-gnu', | ||
'/System/Library/Frameworks', | ||
'/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks', | ||
'/usr/local/opt/[email protected]/Frameworks', | ||
'/opt/local/lib/libomp' | ||
]) | ||
# TODO: Including system libraries rather than libaries we build ourselves may be dangerous! | ||
|