summaryrefslogtreecommitdiff
path: root/indra/newview/viewer_manifest.py
diff options
context:
space:
mode:
authorcallum@lindenlab.com <callum@lindenlab.com>2017-02-24 15:44:36 -0800
committercallum@lindenlab.com <callum@lindenlab.com>2017-02-24 15:44:36 -0800
commit08940da90ee944dd838b1db65658c39bb0aa80d4 (patch)
treea137f0c8dd9a993d6cf2e9f83cf36d1f0dec838c /indra/newview/viewer_manifest.py
parentbff83a7f415635cf575520bc747e5da7a5b1ef0f (diff)
First round of changes to make the macOS 64 build work
Diffstat (limited to 'indra/newview/viewer_manifest.py')
-rwxr-xr-xindra/newview/viewer_manifest.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index c5bd91e396..3b80f519f4 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -858,6 +858,13 @@ class DarwinManifest(ViewerManifest):
self.end_prefix()
+ # the helper app needs to have it's @executable_path modified to point to the
+ # same location we drop the CEF framework shortcut
+ helperexecutablepath = self.dst_path_of('SLPlugin.app/Contents/Frameworks/DullahanHelper.app/Contents/MacOS/DullahanHelper')
+ self.run_command('install_name_tool -change '
+ '"@executable_path/Chromium Embedded Framework" '
+ '"@executable_path/Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework" "%s"' % helperexecutablepath)
+
# SLPlugin plugins
if self.prefix(src="", dst="llplugin"):
self.path2basename("../media_plugins/cef/" + self.args['configuration'],