Skip to content

Commit d1a7095

Browse files
author
Sam Weinig
committed
Only set -allowable_client WebKit2 for engineering builds on SnowLeopard
and later. Reviewed by Mark Rowe. * Configurations/WebCore.xcconfig: Canonical link: https://commits.webkit.org/49700@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@58431 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent d1db175 commit d1a7095

2 files changed

Lines changed: 17 additions & 3 deletions

File tree

WebCore/ChangeLog

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
2010-04-28 Sam Weinig <sam@webkit.org>
2+
3+
Reviewed by Mark Rowe.
4+
5+
Only set -allowable_client WebKit2 for engineering builds on SnowLeopard
6+
and later.
7+
8+
* Configurations/WebCore.xcconfig:
9+
110
2010-04-28 Darin Adler <darin@apple.com>
211

312
Reviewed by Adele Peterson.

WebCore/Configurations/WebCore.xcconfig

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,14 @@ INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Fram
3939
INSTALLHDRS_COPY_PHASE = YES;
4040
INSTALLHDRS_SCRIPT_PHASE = YES;
4141
PRODUCT_NAME = WebCore;
42-
UMBRELLA_LDFLAGS = -umbrella WebKit -allowable_client WebKit2;
43-
VISIBILITY_LDFLAGS = ;
44-
OTHER_LDFLAGS = -l$(SQLITE3_LIBRARY) -lobjc -sub_library libobjc $(UMBRELLA_LDFLAGS) $(VISIBILITY_LDFLAGS);
42+
43+
OTHER_LDFLAGS = -l$(SQLITE3_LIBRARY) -lobjc -sub_library libobjc -umbrella WebKit $(WEBKIT2_LDFLAGS);
44+
45+
WEBKIT2_LDFLAGS = $(WEBKIT2_LDFLAGS_$(TARGET_MAC_OS_X_VERSION_MAJOR));
46+
WEBKIT2_LDFLAGS_1060 = $(WEBKIT2_LDFLAGS_$(CONFIGURATION));
47+
WEBKIT2_LDFLAGS_1070 = $(WEBKIT2_LDFLAGS_$(CONFIGURATION));
48+
WEBKIT2_LDFLAGS_Release = -allowable_client WebKit2;
49+
WEBKIT2_LDFLAGS_Debug = -allowable_client WebKit2;
4550

4651
JAVASCRIPTCORE_PRIVATE_HEADERS_DIR = $(JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_$(REAL_PLATFORM_NAME)_$(CONFIGURATION));
4752
JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_macosx_Release = $(JAVASCRIPTCORE_PRIVATE_HEADERS_engineering);

0 commit comments

Comments
 (0)