Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
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...
commit 0380ca87ed728ffa38c61e6ff3e0cac7939f1695 1 parent b16a03a
@bsmedberg bsmedberg authored
Showing with 0 additions and 9 deletions.
  1. +0 −9 ipc/app/Makefile.in
View
9 ipc/app/Makefile.in
@@ -113,14 +113,6 @@ endif
endif
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-# Create an app bundle
-MOZ_FIX_LINK_PATHS+=-Wl,-headerpad_max_install_names
-# 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.
-paren=\(
-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)")
libs::
$(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/InfoPlist.strings.in | \
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)
endif
Please sign in to comment.
Something went wrong with that request. Please try again.