Commit 6eef403f authored by weinig@apple.com's avatar weinig@apple.com
Browse files

Fix for https://bugs.webkit.org/show_bug.cgi?id=38238

Allow both WebKit and WebKit2 to link to the same WebCore.framework

Reviewed by Maciej Stachowiak.

WebCore: 

* Configurations/WebCore.xcconfig: Use -allowable_client WebKit2 to add
WebKit2 to the list of frameworks that can link directly to WebCore. It
is not necessary for it to be an umbrella since we don't need to reexport
any symbols.

WebKit2: 

* Configurations/WebKit2.xcconfig: Remove the OTHER_LDFLAGS. We don't
need to set WebCore as a sub_umbrella of WebKit2, since we are not
reexporting any of its symbols.

WebKitTools: 

* Scripts/build-webkit: Remove the UMBRELLA_LDFLAGS override when building
WebCore for WebKit2, it is no longer necessary.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@58367 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent f5e8310e
2010-04-27 Sam Weinig <sam@webkit.org>
Reviewed by Maciej Stachowiak.
Fix for https://bugs.webkit.org/show_bug.cgi?id=38238
Allow both WebKit and WebKit2 to link to the same WebCore.framework
* Configurations/WebCore.xcconfig: Use -allowable_client WebKit2 to add
WebKit2 to the list of frameworks that can link directly to WebCore. It
is not necessary for it to be an umbrella since we don't need to reexport
any symbols.
2010-04-27 Dumitru Daniliuc <dumi@chromium.org>
 
Reviewed by David Levin.
......@@ -39,7 +39,7 @@ INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Fram
INSTALLHDRS_COPY_PHASE = YES;
INSTALLHDRS_SCRIPT_PHASE = YES;
PRODUCT_NAME = WebCore;
UMBRELLA_LDFLAGS = -umbrella WebKit;
UMBRELLA_LDFLAGS = -umbrella WebKit -allowable_client WebKit2;
VISIBILITY_LDFLAGS = ;
OTHER_LDFLAGS = -l$(SQLITE3_LIBRARY) -lobjc -sub_library libobjc $(UMBRELLA_LDFLAGS) $(VISIBILITY_LDFLAGS);
......
2010-04-27 Sam Weinig <sam@webkit.org>
Reviewed by Maciej Stachowiak.
Fix for https://bugs.webkit.org/show_bug.cgi?id=38238
Allow both WebKit and WebKit2 to link to the same WebCore.framework
* Configurations/WebKit2.xcconfig: Remove the OTHER_LDFLAGS. We don't
need to set WebCore as a sub_umbrella of WebKit2, since we are not
reexporting any of its symbols.
2010-04-27 Sam Weinig <sam@webkit.org>
Reviewed by Geoffrey Garen.
......
......@@ -26,7 +26,6 @@
PRODUCT_NAME = WebKit2;
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks;
OTHER_LDFLAGS = -sub_umbrella WebCore $(OTHER_LDFLAGS);
// FIXME: We need to add an exports file to limit the set of exported symbols.
// EXPORTED_SYMBOLS_FILE = $(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH));
......
2010-04-27 Sam Weinig <sam@webkit.org>
Reviewed by Maciej Stachowiak.
Fix for https://bugs.webkit.org/show_bug.cgi?id=38238
Allow both WebKit and WebKit2 to link to the same WebCore.framework
* Scripts/build-webkit: Remove the UMBRELLA_LDFLAGS override when building
WebCore for WebKit2, it is no longer necessary.
2010-04-27 James Robinson <jamesr@chromium.org>
 
Reviewed by David Levin.
......@@ -394,15 +394,7 @@ for my $dir (@projects) {
} elsif (isQt()) {
$result = buildQMakeQtProject($dir, $clean, @options);
} elsif (isAppleMacWebKit()) {
my @completeOptions = @options;
if ($webkit2 && $dir eq "WebCore") {
my @webKit2SpecificOverrides = (
'UMBRELLA_LDFLAGS='
);
push @completeOptions, @webKit2SpecificOverrides;
}
$result = buildXCodeProject($dir, $clean, @completeOptions, @ARGV);
$result = buildXCodeProject($dir, $clean, @options, @ARGV);
} elsif (isAppleWinWebKit()) {
if ($dir eq "WebKit") {
$result = buildVisualStudioProject("win/WebKit.vcproj/WebKit.sln", $clean);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment