Changeset 58367 in webkit
- Timestamp:
- Apr 27, 2010 6:28:34 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r58366 r58367 1 2010-04-27 Sam Weinig <sam@webkit.org> 2 3 Reviewed by Maciej Stachowiak. 4 5 Fix for https://bugs.webkit.org/show_bug.cgi?id=38238 6 Allow both WebKit and WebKit2 to link to the same WebCore.framework 7 8 * Configurations/WebCore.xcconfig: Use -allowable_client WebKit2 to add 9 WebKit2 to the list of frameworks that can link directly to WebCore. It 10 is not necessary for it to be an umbrella since we don't need to reexport 11 any symbols. 12 1 13 2010-04-27 Dumitru Daniliuc <dumi@chromium.org> 2 14 -
trunk/WebCore/Configurations/WebCore.xcconfig
r55867 r58367 40 40 INSTALLHDRS_SCRIPT_PHASE = YES; 41 41 PRODUCT_NAME = WebCore; 42 UMBRELLA_LDFLAGS = -umbrella WebKit ;42 UMBRELLA_LDFLAGS = -umbrella WebKit -allowable_client WebKit2; 43 43 VISIBILITY_LDFLAGS = ; 44 44 OTHER_LDFLAGS = -l$(SQLITE3_LIBRARY) -lobjc -sub_library libobjc $(UMBRELLA_LDFLAGS) $(VISIBILITY_LDFLAGS); -
trunk/WebKit2/ChangeLog
r58332 r58367 1 2010-04-27 Sam Weinig <sam@webkit.org> 2 3 Reviewed by Maciej Stachowiak. 4 5 Fix for https://bugs.webkit.org/show_bug.cgi?id=38238 6 Allow both WebKit and WebKit2 to link to the same WebCore.framework 7 8 * Configurations/WebKit2.xcconfig: Remove the OTHER_LDFLAGS. We don't 9 need to set WebCore as a sub_umbrella of WebKit2, since we are not 10 reexporting any of its symbols. 11 1 12 2010-04-27 Sam Weinig <sam@webkit.org> 2 13 -
trunk/WebKit2/Configurations/WebKit2.xcconfig
r57389 r58367 27 27 INFOPLIST_FILE = Info.plist; 28 28 INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks; 29 OTHER_LDFLAGS = -sub_umbrella WebCore $(OTHER_LDFLAGS);30 29 31 30 // FIXME: We need to add an exports file to limit the set of exported symbols. -
trunk/WebKitTools/ChangeLog
r58364 r58367 1 2010-04-27 Sam Weinig <sam@webkit.org> 2 3 Reviewed by Maciej Stachowiak. 4 5 Fix for https://bugs.webkit.org/show_bug.cgi?id=38238 6 Allow both WebKit and WebKit2 to link to the same WebCore.framework 7 8 * Scripts/build-webkit: Remove the UMBRELLA_LDFLAGS override when building 9 WebCore for WebKit2, it is no longer necessary. 10 1 11 2010-04-27 James Robinson <jamesr@chromium.org> 2 12 -
trunk/WebKitTools/Scripts/build-webkit
r58324 r58367 395 395 $result = buildQMakeQtProject($dir, $clean, @options); 396 396 } elsif (isAppleMacWebKit()) { 397 my @completeOptions = @options; 398 if ($webkit2 && $dir eq "WebCore") { 399 my @webKit2SpecificOverrides = ( 400 'UMBRELLA_LDFLAGS=' 401 ); 402 push @completeOptions, @webKit2SpecificOverrides; 403 } 404 405 $result = buildXCodeProject($dir, $clean, @completeOptions, @ARGV); 397 $result = buildXCodeProject($dir, $clean, @options, @ARGV); 406 398 } elsif (isAppleWinWebKit()) { 407 399 if ($dir eq "WebKit") {
Note: See TracChangeset
for help on using the changeset viewer.