diff options
| author | Oz Linden <oz@lindenlab.com> | 2019-09-20 04:35:15 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2019-09-20 04:35:15 -0400 |
| commit | f87e1a43b803d8d84ab0ff6683985c0f604522ff (patch) | |
| tree | bf6476c226adc5606379972abdb63c02f79d1b98 | |
| parent | 5aff3dfaf950c16ca6ea5708026f917602021dcb (diff) | |
remove obsolete llcommon dylib for Mac
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index caf7815497..f56dd461d8 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -1018,15 +1018,19 @@ class DarwinManifest(ViewerManifest): # symlink from sub-app/Contents/Resources to the real .dylib. # Need to get the llcommon dll from any of the build directories as well. libfile_parent = self.get_dst_prefix() + dylibs=[] for libfile in ( "libapr-1.0.dylib", "libaprutil-1.0.dylib", "libexpat.1.dylib", "libexception_handler.dylib", "libGLOD.dylib", + # libnghttp2.dylib is a symlink to + # libnghttp2.major.dylib, which is a symlink to + # libnghttp2.version.dylib. Get all of them. "libnghttp2.*dylib", ): - dylibs = path_optional(os.path.join(relpkgdir, libfile), libfile) + dylibs += path_optional(os.path.join(relpkgdir, libfile), libfile) # SLVoice and vivox lols, no symlinks needed for libfile in ( |