Browse files

Remove pieces of bug 557225 which depend on the incorrect @loader_pat…

…h changes in bug 578751. This will probably allow plugin-container to launch, because DYLD_LIBRARY_PATH has been munged for it. a=johnath for pushing to a CLOSED TREE
  • Loading branch information...
bsmedberg committed Jul 20, 2010
1 parent b16a03a commit 0380ca87ed728ffa38c61e6ff3e0cac7939f1695
Showing with 0 additions and 9 deletions.
  1. +0 −9 ipc/app/
@@ -113,14 +113,6 @@ endif
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-# Create an app bundle
-# We need to fix the install names for the Gecko libraries we're linked to.
-# They're all @loader_path/libfoo.dylib, but this binary lives in a bundle
-# underneath that.
-LIST_INSTALL_NAMES=$(shell otool -L $(PROGRAM) | grep "@loader_path" | tr -s '\t ' ' ' | cut -f1 -d$(paren) | xargs echo)
-FIX_INSTALL_NAMES=$(foreach l,$(LIST_INSTALL_NAMES),-change "$l" "$(subst @loader_path,@loader_path/../../..,$l)")
$(NSINSTALL) -D $(DIST)/bin/$(PROGRAM).app
@@ -129,7 +121,6 @@ libs::
sed -e "s/%APP_NAME%/$(MOZ_APP_DISPLAYNAME)/" $(srcdir)/macbuild/Contents/Resources/English.lproj/ | \
iconv -f UTF-8 -t UTF-16 > $(DIST)/bin/$(PROGRAM).app/Contents/Resources/English.lproj/InfoPlist.strings
$(NSINSTALL) -D $(DIST)/bin/$(PROGRAM).app/Contents/MacOS
- install_name_tool $(FIX_INSTALL_NAMES) $(PROGRAM)
$(NSINSTALL) $(PROGRAM) $(DIST)/bin/$(PROGRAM).app/Contents/MacOS
rm -f $(DIST)/bin/$(PROGRAM)

0 comments on commit 0380ca8

Please sign in to comment.