Attachment 360126 Details for Bug 193793 – Patch

[patch] Patch

bug-193793-20190125105111.patch (text/plain), 19.48 KB, created by Keith Rollin on 2019-01-25 10:51:11 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Keith Rollin

Created: 2019-01-25 10:51:11 PST

Size: 19.48 KB

patch

obsolete

>Subversion Revision: 240454
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index 2e248fd12689d60a0cc0e2bb3360567c19334b54..3be85680a4a4249577178fa38c337f4bb450ac9e 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,34 @@
>+2019-01-24  Keith Rollin  <krollin@apple.com>
>+
>+        Update WebKitAdditions.xcconfig with correct order of variable definitions
>+        https://bugs.webkit.org/show_bug.cgi?id=193793
>+        <rdar://problem/47532439>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        XCBuild changes the way xcconfig variables are evaluated. In short,
>+        all config file assignments are now considered in part of the
>+        evaluation. When using the new build system and an .xcconfig file
>+        contains multiple assignments of the same build setting:
>+
>+        - Later assignments using $(inherited) will inherit from earlier
>+          assignments in the xcconfig file.
>+        - Later assignments not using $(inherited) will take precedence over
>+          earlier assignments. An assignment to a more general setting will
>+          mask an earlier assignment to a less general setting. For example,
>+          an assignment without a condition ('FOO = bar') will completely mask
>+          an earlier assignment with a condition ('FOO[sdk=macos*] = quux').
>+
>+        This affects some of our .xcconfig files, in that sometimes platform-
>+        or sdk-specific definitions appear before the general definitions.
>+        Under the new evaluations rules, the general definitions alway take
>+        effect because they always overwrite the more-specific definitions. The
>+        solution is to swap the order, so that the general definitions are
>+        established first, and then conditionally overwritten by the
>+        more-specific definitions.
>+
>+        * Configurations/Version.xcconfig:
>+
> 2019-01-24  Keith Rollin  <krollin@apple.com>
> 
>         Add .xcfilelists to Run Script build phases
>diff --git a/Source/ThirdParty/libwebrtc/ChangeLog b/Source/ThirdParty/libwebrtc/ChangeLog
>index 7e16131c11f2c906ddb37cf65c108067e007f569..d5c0887d474f9bea1536002bee170df349d12983 100644
>--- a/Source/ThirdParty/libwebrtc/ChangeLog
>+++ b/Source/ThirdParty/libwebrtc/ChangeLog
>@@ -1,3 +1,34 @@
>+2019-01-24  Keith Rollin  <krollin@apple.com>
>+
>+        Update WebKitAdditions.xcconfig with correct order of variable definitions
>+        https://bugs.webkit.org/show_bug.cgi?id=193793
>+        <rdar://problem/47532439>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        XCBuild changes the way xcconfig variables are evaluated. In short,
>+        all config file assignments are now considered in part of the
>+        evaluation. When using the new build system and an .xcconfig file
>+        contains multiple assignments of the same build setting:
>+
>+        - Later assignments using $(inherited) will inherit from earlier
>+          assignments in the xcconfig file.
>+        - Later assignments not using $(inherited) will take precedence over
>+          earlier assignments. An assignment to a more general setting will
>+          mask an earlier assignment to a less general setting. For example,
>+          an assignment without a condition ('FOO = bar') will completely mask
>+          an earlier assignment with a condition ('FOO[sdk=macos*] = quux').
>+
>+        This affects some of our .xcconfig files, in that sometimes platform-
>+        or sdk-specific definitions appear before the general definitions.
>+        Under the new evaluations rules, the general definitions alway take
>+        effect because they always overwrite the more-specific definitions. The
>+        solution is to swap the order, so that the general definitions are
>+        established first, and then conditionally overwritten by the
>+        more-specific definitions.
>+
>+        * Configurations/Version.xcconfig:
>+
> 2019-01-22  Youenn Fablet  <youenn@apple.com>
> 
>         Resync libwebrtc with latest M72 branch
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index d15c259564be80fc563bf5b182ed22f64c40f39f..06f8a394f0222f965bdffe85249cedde914869e2 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,37 @@
>+2019-01-24  Keith Rollin  <krollin@apple.com>
>+
>+        Update WebKitAdditions.xcconfig with correct order of variable definitions
>+        https://bugs.webkit.org/show_bug.cgi?id=193793
>+        <rdar://problem/47532439>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        XCBuild changes the way xcconfig variables are evaluated. In short,
>+        all config file assignments are now considered in part of the
>+        evaluation. When using the new build system and an .xcconfig file
>+        contains multiple assignments of the same build setting:
>+
>+        - Later assignments using $(inherited) will inherit from earlier
>+          assignments in the xcconfig file.
>+        - Later assignments not using $(inherited) will take precedence over
>+          earlier assignments. An assignment to a more general setting will
>+          mask an earlier assignment to a less general setting. For example,
>+          an assignment without a condition ('FOO = bar') will completely mask
>+          an earlier assignment with a condition ('FOO[sdk=macos*] = quux').
>+
>+        This affects some of our .xcconfig files, in that sometimes platform-
>+        or sdk-specific definitions appear before the general definitions.
>+        Under the new evaluations rules, the general definitions alway take
>+        effect because they always overwrite the more-specific definitions. The
>+        solution is to swap the order, so that the general definitions are
>+        established first, and then conditionally overwritten by the
>+        more-specific definitions.
>+
>+        No new tests since there should be no observable behavior difference.
>+
>+        * Configurations/Base.xcconfig:
>+        * Configurations/Version.xcconfig:
>+
> 2019-01-24  Keith Rollin  <krollin@apple.com>
> 
>         Add .xcfilelists to Run Script build phases
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index f13e8b3e3b84c0b0df68e554f88f8b671518779f..4baf430f1077e4198ef6b9886ce284f1946dc7ef 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,36 @@
>+2019-01-24  Keith Rollin  <krollin@apple.com>
>+
>+        Update WebKitAdditions.xcconfig with correct order of variable definitions
>+        https://bugs.webkit.org/show_bug.cgi?id=193793
>+        <rdar://problem/47532439>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        XCBuild changes the way xcconfig variables are evaluated. In short,
>+        all config file assignments are now considered in part of the
>+        evaluation. When using the new build system and an .xcconfig file
>+        contains multiple assignments of the same build setting:
>+
>+        - Later assignments using $(inherited) will inherit from earlier
>+          assignments in the xcconfig file.
>+        - Later assignments not using $(inherited) will take precedence over
>+          earlier assignments. An assignment to a more general setting will
>+          mask an earlier assignment to a less general setting. For example,
>+          an assignment without a condition ('FOO = bar') will completely mask
>+          an earlier assignment with a condition ('FOO[sdk=macos*] = quux').
>+
>+        This affects some of our .xcconfig files, in that sometimes platform-
>+        or sdk-specific definitions appear before the general definitions.
>+        Under the new evaluations rules, the general definitions alway take
>+        effect because they always overwrite the more-specific definitions. The
>+        solution is to swap the order, so that the general definitions are
>+        established first, and then conditionally overwritten by the
>+        more-specific definitions.
>+
>+        * Configurations/BaseTarget.xcconfig:
>+        * Configurations/Version.xcconfig:
>+        * Configurations/WebKit.xcconfig:
>+
> 2019-01-24  Keith Rollin  <krollin@apple.com>
> 
>         Add .xcfilelists to Run Script build phases
>diff --git a/Source/WebKitLegacy/mac/ChangeLog b/Source/WebKitLegacy/mac/ChangeLog
>index 247391ed51a2dd829af5a4d85af79c363260c933..f091cfe39604a63d470fd553bb139dbb368f438f 100644
>--- a/Source/WebKitLegacy/mac/ChangeLog
>+++ b/Source/WebKitLegacy/mac/ChangeLog
>@@ -1,3 +1,35 @@
>+2019-01-24  Keith Rollin  <krollin@apple.com>
>+
>+        Update WebKitAdditions.xcconfig with correct order of variable definitions
>+        https://bugs.webkit.org/show_bug.cgi?id=193793
>+        <rdar://problem/47532439>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        XCBuild changes the way xcconfig variables are evaluated. In short,
>+        all config file assignments are now considered in part of the
>+        evaluation. When using the new build system and an .xcconfig file
>+        contains multiple assignments of the same build setting:
>+
>+        - Later assignments using $(inherited) will inherit from earlier
>+          assignments in the xcconfig file.
>+        - Later assignments not using $(inherited) will take precedence over
>+          earlier assignments. An assignment to a more general setting will
>+          mask an earlier assignment to a less general setting. For example,
>+          an assignment without a condition ('FOO = bar') will completely mask
>+          an earlier assignment with a condition ('FOO[sdk=macos*] = quux').
>+
>+        This affects some of our .xcconfig files, in that sometimes platform-
>+        or sdk-specific definitions appear before the general definitions.
>+        Under the new evaluations rules, the general definitions alway take
>+        effect because they always overwrite the more-specific definitions. The
>+        solution is to swap the order, so that the general definitions are
>+        established first, and then conditionally overwritten by the
>+        more-specific definitions.
>+
>+        * Configurations/Version.xcconfig:
>+        * Configurations/WebKitLegacy.xcconfig:
>+
> 2019-01-24  John Wilander  <wilander@apple.com>
> 
>         Add Ad Click Attribution as an internal/experimental feature
>diff --git a/Source/JavaScriptCore/Configurations/Version.xcconfig b/Source/JavaScriptCore/Configurations/Version.xcconfig
>index 585cb91d7f62765d1b7b0959b2e9c38927749d66..c5a3f6fe56a80017a720719e5e7b2f8f78954f76 100644
>--- a/Source/JavaScriptCore/Configurations/Version.xcconfig
>+++ b/Source/JavaScriptCore/Configurations/Version.xcconfig
>@@ -33,12 +33,12 @@ BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));
> SHORT_VERSION_STRING = $(SHORT_VERSION_STRING_$(CONFIGURATION))
> 
> // The system version prefix is based on the current system version.
>-SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
> SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
> SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
> SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
> SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
> SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
>+SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
> 
> // The production build always uses the full version with a system version prefix.
> BUNDLE_VERSION_Production = $(SYSTEM_VERSION_PREFIX)$(FULL_VERSION);
>diff --git a/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig b/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig
>index 585cb91d7f62765d1b7b0959b2e9c38927749d66..c5a3f6fe56a80017a720719e5e7b2f8f78954f76 100644
>--- a/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig
>+++ b/Source/ThirdParty/libwebrtc/Configurations/Version.xcconfig
>@@ -33,12 +33,12 @@ BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));
> SHORT_VERSION_STRING = $(SHORT_VERSION_STRING_$(CONFIGURATION))
> 
> // The system version prefix is based on the current system version.
>-SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
> SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
> SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
> SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
> SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
> SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
>+SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
> 
> // The production build always uses the full version with a system version prefix.
> BUNDLE_VERSION_Production = $(SYSTEM_VERSION_PREFIX)$(FULL_VERSION);
>diff --git a/Source/WebCore/Configurations/Base.xcconfig b/Source/WebCore/Configurations/Base.xcconfig
>index b29681ed79044042645eb7ddc673eae0f7f071f6..97e5509d29c9c0414c0aee8901125bbd5015f5a1 100644
>--- a/Source/WebCore/Configurations/Base.xcconfig
>+++ b/Source/WebCore/Configurations/Base.xcconfig
>@@ -159,8 +159,8 @@ WK_XCODE_VERSION_BEFORE_9_0800 = YES;
> WK_XCODE_VERSION_BEFORE_9_0700 = YES;
> 
> WK_USER_LTO_MODE = $(WK_USER_LTO_MODE_$(WK_LTO_MODE));
>-WK_USER_LTO_MODE_full[arch=i386] = $(WK_USER_LTO_MODE_thin);
> WK_USER_LTO_MODE_full = YES;
>+WK_USER_LTO_MODE_full[arch=i386] = $(WK_USER_LTO_MODE_thin);
> WK_USER_LTO_MODE_thin = YES_THIN;
> WK_USER_LTO_MODE_none = NO;
> WK_USER_LTO_MODE_ = $(WK_DEFAULT_LTO_MODE);
>diff --git a/Source/WebCore/Configurations/Version.xcconfig b/Source/WebCore/Configurations/Version.xcconfig
>index 01aee662034c29611e0d01c71bb011fb7efffa52..42d9ee53ea6278df59081f07eb7d7d3aabc12976 100644
>--- a/Source/WebCore/Configurations/Version.xcconfig
>+++ b/Source/WebCore/Configurations/Version.xcconfig
>@@ -33,12 +33,12 @@ BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));
> SHORT_VERSION_STRING = $(SHORT_VERSION_STRING_$(CONFIGURATION))
> 
> // The system version prefix is based on the current system version.
>-SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
> SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
> SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
> SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
> SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
> SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
>+SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
> 
> // The production build always uses the full version with a system version prefix.
> BUNDLE_VERSION_Production = $(SYSTEM_VERSION_PREFIX)$(FULL_VERSION);
>diff --git a/Source/WebKit/Configurations/BaseTarget.xcconfig b/Source/WebKit/Configurations/BaseTarget.xcconfig
>index 9fa08f579ebc9e213d88ed774aadc59e3499ab12..0b9f31945670a926a7666261d54a20a9d0e8d324 100644
>--- a/Source/WebKit/Configurations/BaseTarget.xcconfig
>+++ b/Source/WebKit/Configurations/BaseTarget.xcconfig
>@@ -28,8 +28,8 @@ WK_PRIVATE_FRAMEWORKS_DIR = $(WK_PRIVATE_FRAMEWORKS_DIR_$(USE_INTERNAL_SDK));
> WK_PRIVATE_FRAMEWORKS_DIR_[sdk=iphone*] = $(PROJECT_DIR)/../../WebKitLibraries/WebKitPrivateFrameworkStubs/iOS/$(WK_TARGET_IOS_VERSION_MAJOR);
> 
> FRAMEWORK_SEARCH_PATHS_base = "$(UMBRELLA_FRAMEWORKS_DIR)"
>-FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(FRAMEWORK_SEARCH_PATHS_base) $(WK_PRIVATE_FRAMEWORKS_DIR);
> FRAMEWORK_SEARCH_PATHS = $(FRAMEWORK_SEARCH_PATHS_base);
>+FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(FRAMEWORK_SEARCH_PATHS_base) $(WK_PRIVATE_FRAMEWORKS_DIR);
> 
> SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
> 
>diff --git a/Source/WebKit/Configurations/Version.xcconfig b/Source/WebKit/Configurations/Version.xcconfig
>index a349dce30319a0d5a37a1a15d8f29db21144998d..612f2c7767497aa4c44ad78dd909135feca00893 100644
>--- a/Source/WebKit/Configurations/Version.xcconfig
>+++ b/Source/WebKit/Configurations/Version.xcconfig
>@@ -33,12 +33,12 @@ BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));
> SHORT_VERSION_STRING = $(SHORT_VERSION_STRING_$(CONFIGURATION))
> 
> // The system version prefix is based on the current system version.
>-SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
> SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
> SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
> SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
> SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
> SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
>+SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
> 
> // The production build always uses the full version with a system version prefix.
> BUNDLE_VERSION_Production = $(SYSTEM_VERSION_PREFIX)$(FULL_VERSION);
>diff --git a/Source/WebKit/Configurations/WebKit.xcconfig b/Source/WebKit/Configurations/WebKit.xcconfig
>index f2318ec4e9aff6fd8bb9dcf47420c1ee68ceff2b..d9296a30be86a3c869237cf65a8623c9862a412e 100644
>--- a/Source/WebKit/Configurations/WebKit.xcconfig
>+++ b/Source/WebKit/Configurations/WebKit.xcconfig
>@@ -101,8 +101,8 @@ WK_OPENGL_LDFLAGS_macosx = -framework OpenGL;
> 
> WK_PDFKIT_LDFLAGS = $(WK_PDFKIT_LDFLAGS_$(WK_PLATFORM_NAME));
> WK_PDFKIT_LDFLAGS_iphoneos = -framework PDFKit;
>-WK_PDFKIT_LDFLAGS_iphonesimulator = $(WK_PDFKIT_LDFLAGS_iphoneos);
> WK_PDFKIT_LDFLAGS_iphoneos[sdk=iphone*11.*] = ;
>+WK_PDFKIT_LDFLAGS_iphonesimulator = $(WK_PDFKIT_LDFLAGS_iphoneos);
> WK_PDFKIT_LDFLAGS_iphonesimulator[sdk=iphone*11.*] = ;
> 
> WK_PROXIMITY_NETWORKING_LDFLAGS = $(WK_PROXIMITY_NETWORKING_LDFLAGS_$(WK_PLATFORM_NAME));
>@@ -110,11 +110,11 @@ WK_PROXIMITY_NETWORKING_LDFLAGS_watchos = -framework IDS -framework MobileWiFi -
> 
> WK_SAFE_BROWSING_LDFLAGS = $(WK_SAFE_BROWSING_LDFLAGS_$(WK_PLATFORM_NAME));
> WK_SAFE_BROWSING_LDFLAGS_iphoneos = -framework SafariSafeBrowsing;
>+WK_SAFE_BROWSING_LDFLAGS_iphoneos[sdk=iphone*10.*] = ;
> WK_SAFE_BROWSING_LDFLAGS_iphonesimulator = -framework SafariSafeBrowsing;
>+WK_SAFE_BROWSING_LDFLAGS_iphonesimulator[sdk=iphone*10.*] = ;
> WK_SAFE_BROWSING_LDFLAGS_watchos = -framework SafariSafeBrowsing;
> WK_SAFE_BROWSING_LDFLAGS_watchsimulator = -framework SafariSafeBrowsing;
>-WK_SAFE_BROWSING_LDFLAGS_iphoneos[sdk=iphone*10.*] = ;
>-WK_SAFE_BROWSING_LDFLAGS_iphonesimulator[sdk=iphone*10.*] = ;
> WK_SAFE_BROWSING_LDFLAGS_macosx = $(WK_SAFE_BROWSING_LDFLAGS$(WK_MACOS_1013));
> WK_SAFE_BROWSING_LDFLAGS_MACOS_SINCE_1013 = -weak_framework SafariSafeBrowsing;
> 
>diff --git a/Source/WebKitLegacy/mac/Configurations/Version.xcconfig b/Source/WebKitLegacy/mac/Configurations/Version.xcconfig
>index 01aee662034c29611e0d01c71bb011fb7efffa52..42d9ee53ea6278df59081f07eb7d7d3aabc12976 100644
>--- a/Source/WebKitLegacy/mac/Configurations/Version.xcconfig
>+++ b/Source/WebKitLegacy/mac/Configurations/Version.xcconfig
>@@ -33,12 +33,12 @@ BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION));
> SHORT_VERSION_STRING = $(SHORT_VERSION_STRING_$(CONFIGURATION))
> 
> // The system version prefix is based on the current system version.
>-SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
> SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
> SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
> SYSTEM_VERSION_PREFIX_macosx_101300 = 13;
> SYSTEM_VERSION_PREFIX_macosx_101400 = 14;
> SYSTEM_VERSION_PREFIX_macosx_101500 = 15;
>+SYSTEM_VERSION_PREFIX[sdk=iphone*] = 8;
> 
> // The production build always uses the full version with a system version prefix.
> BUNDLE_VERSION_Production = $(SYSTEM_VERSION_PREFIX)$(FULL_VERSION);
>diff --git a/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig b/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
>index 4fbbbef31f4ac6658b731e67c40c22974fb67883..ea1e1ddbc7150f7c5afa059333a2bce5fc81b7e1 100644
>--- a/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
>+++ b/Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
>@@ -63,10 +63,10 @@ INSTALL_PATH = $(INSTALL_PATH_COCOA_TOUCH_$(WK_IS_COCOA_TOUCH));
> INSTALL_PATH_COCOA_TOUCH_YES = $(WK_ALTERNATE_WEBKIT_SDK_PATH)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
> INSTALL_PATH_COCOA_TOUCH_NO = $(WEBKIT_LEGACY_FRAMEWORKS_DIR);
> 
>-DYLIB_INSTALL_NAME_BASE[sdk=iphone*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
> DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
> DYLIB_INSTALL_NAME_BASE_NO = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR);
> DYLIB_INSTALL_NAME_BASE_YES = $(DYLIB_INSTALL_NAME_BASE);
>+DYLIB_INSTALL_NAME_BASE[sdk=iphone*] = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
> 
> INSTALLHDRS_COPY_PHASE = YES;
> INSTALLHDRS_SCRIPT_PHASE = YES;

Actions: View | Formatted Diff | Diff

Attachments on bug 193793: 360126