Changeset 168501 in webkit


Ignore:
Timestamp:
May 8, 2014, 4:02:35 PM (11 years ago)
Author:
Lucas Forschler
Message:

Merged r168500.

Location:
branches/safari-538.34-branch/Source/WebKit/mac
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/safari-538.34-branch/Source/WebKit/mac/ChangeLog

    r168492 r168501  
     12014-05-08  Lucas Forschler  <lforschler@apple.com>
     2
     3        Merge r168500
     4
     5    2014-05-08  Anders Carlsson  <andersca@apple.com>
     6
     7            Use a different install name for WebKitLegacy.framework for staged framework builds
     8            https://bugs.webkit.org/show_bug.cgi?id=132711
     9            <rdar://problem/16850620>
     10
     11            Reviewed by Dan Bernstein.
     12
     13            * Configurations/WebKitLegacy.xcconfig:
     14
    1152014-05-08  Lucas Forschler  <lforschler@apple.com>
    216

  • branches/safari-538.34-branch/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig

    r168047 r168501  
    5858OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
    5959
     60WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING = $(WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING_$(TARGET_MAC_OS_X_VERSION_MAJOR));
     61WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING_1080 = YES;
     62WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING_1090 = YES;
     63
    6064GCC_PREFIX_HEADER = mac/WebKitPrefix.h;
    6165GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKitLegacy WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST $(GCC_PREPROCESSOR_DEFINITIONS);
    … …  
    6872INSTALL_PATH_ACTUAL = $(INSTALL_PATH_ACTUAL_$(PLATFORM_NAME));
    6973INSTALL_PATH_ACTUAL_iphonesimulator = $(INSTALL_PATH_iphoneos);
     74
    7075DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(PLATFORM_NAME));
    71 DYLIB_INSTALL_NAME_BASE_macosx = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR);
     76DYLIB_INSTALL_NAME_BASE_macosx = $(DYLIB_INSTALL_NAME_BASE_macosx_WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING_$(WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING));
     77DYLIB_INSTALL_NAME_BASE_macosx_WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING_ = $(NORMAL_WEBKIT_LEGACY_FRAMEWORKS_DIR);
     78DYLIB_INSTALL_NAME_BASE_macosx_WEBKIT_LEGACY_SYSTEM_FRAMEWORK_MISSING_YES = $(WEBKIT_LEGACY_FRAMEWORKS_DIR);
    7279DYLIB_INSTALL_NAME_BASE_iphoneos = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
    7380DYLIB_INSTALL_NAME_BASE_iphonesimulator =  $(SDKROOT)$(DYLIB_INSTALL_NAME_BASE_iphoneos);
     81
    7482INSTALLHDRS_COPY_PHASE = YES;
    7583INSTALLHDRS_SCRIPT_PHASE = YES;
Note: See TracChangeset for help on using the changeset viewer.