Changeset 187090 in webkit


Ignore:
Timestamp:
Jul 20, 2015 10:27:42 PM (9 years ago)
Author:
matthew_hanson@apple.com
Message:

Merge r187027. rdar://problem/21882777

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

Legend:

Unmodified
Added
Removed

  • branches/safari-601.1-branch/Source/WebKit/ChangeLog

    r186607 r187090  
     12015-07-20  Matthew Hanson  <matthew_hanson@apple.com>
     2
     3        Merge r187027. rdar://problem/21882777
     4
     5    2015-07-20  Brent Fulgham  <bfulgham@apple.com>
     6
     7            [Win] Certain Debug builds can take close to 3 hours to link
     8            https://bugs.webkit.org/show_bug.cgi?id=147114
     9            <rdar://problem/21882777>
     10
     11            Reviewed by Tim Horton.
     12
     13            Correct the 64-bit DebugSuffix link target to match the 32-bit version.
     14
     15            * WebKit.vcxproj/WebKit/WebKit.vcxproj: Turn off the REF and ICF
     16            flags for the 64-bit DebugSuffix link target.
     17
    1182015-07-09  Per Arne Vollan  <peavo@outlook.com>
    219

  • branches/safari-601.1-branch/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj

    r185999 r187090  
    234234    <ClCompile />
    235235    <Link />
     236    <Link>
     237      <OptimizeReferences>false</OptimizeReferences>
     238    </Link>
    236239  </ItemDefinitionGroup>
    237240  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    … …  
    284287  </ItemDefinitionGroup>
    285288  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     289    <Link>
     290      <EnableCOMDATFolding>false</EnableCOMDATFolding>
     291    </Link>
     292  </ItemDefinitionGroup>
     293  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">
    286294    <Link>
    287295      <EnableCOMDATFolding>false</EnableCOMDATFolding>
Note: See TracChangeset for help on using the changeset viewer.