Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Increase the headerpad for WebKit XPC Services
https://bugs.webkit.org/show_bug.cgi?id=172571

Patch by Joseph Pecoraro <pecoraro@apple.com> on 2017-05-24
Reviewed by Dan Bernstein.

* Configurations/BaseXPCService.xcconfig:
Increase the headerpad to make room for additional dyld commands.

Canonical link: https://commits.webkit.org/189471@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@217405 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
JosephPecoraro authored and webkit-commit-queue committed May 25, 2017
1 parent 6179a8f commit b85ef51
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
10 changes: 10 additions & 0 deletions Source/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
2017-05-24 Joseph Pecoraro <pecoraro@apple.com>

Increase the headerpad for WebKit XPC Services
https://bugs.webkit.org/show_bug.cgi?id=172571

Reviewed by Dan Bernstein.

* Configurations/BaseXPCService.xcconfig:
Increase the headerpad to make room for additional dyld commands.

2017-05-24 David Keijser <keijser@gmail.com>

[GTK] Provide details on javascript exception
Expand Down
2 changes: 1 addition & 1 deletion Source/WebKit2/Configurations/BaseXPCService.xcconfig
Expand Up @@ -46,7 +46,7 @@ OTHER_LDFLAGS = $(inherited) $(OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH) $(WK_RELO

WK_RELOCATABLE_FRAMEWORKS_LDFLAGS = $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS_$(WK_RELOCATABLE_FRAMEWORKS));
WK_RELOCATABLE_FRAMEWORKS_LDFLAGS_ = $(WK_RELOCATABLE_FRAMEWORKS_LDFLAGS_NO);
WK_RELOCATABLE_FRAMEWORKS_LDFLAGS_NO = -Wl,-headerpad,0x130; // Leave room for adding the dyld environment commands to a service that wasn't built for relocatable frameworks or staged installation.
WK_RELOCATABLE_FRAMEWORKS_LDFLAGS_NO = -Wl,-headerpad,0x180; // Leave room for adding the dyld environment commands to a service that wasn't built for relocatable frameworks or staged installation.
WK_RELOCATABLE_FRAMEWORKS_LDFLAGS_YES = -Wl,-dyld_env,DYLD_FRAMEWORK_PATH=@executable_path/$(WK_PATH_FROM_SERVICE_EXECUTABLE_TO_FRAMEWORK)/..,-dyld_env,DYLD_LIBRARY_PATH=@executable_path/$(WK_PATH_FROM_SERVICE_EXECUTABLE_TO_FRAMEWORK)/Frameworks;

WK_PATH_FROM_SERVICE_EXECUTABLE_TO_FRAMEWORK = $(WK_PATH_FROM_SERVICE_EXECUTABLE_TO_FRAMEWORK_SHALLOW_BUNDLE_$(SHALLOW_BUNDLE));
Expand Down

0 comments on commit b85ef51

Please sign in to comment.