Reviewers: Kevin Millikin, Description: Merge r2478 to branches/1.2 to avoid subtle code generation issues on Mac OS if we decide to merge further changes to the branch.
Please review this at http://codereview.chromium.org/149747 SVN Base: http://v8.googlecode.com/svn/branches/1.2/ Affected files: M src/version.cc M tools/gyp/v8.gyp Index: tools/gyp/v8.gyp =================================================================== --- tools/gyp/v8.gyp (revision 2479) +++ tools/gyp/v8.gyp (working copy) @@ -506,6 +506,20 @@ { 'target_name': 'mksnapshot', 'type': 'executable', + 'configurations': { + 'Release': { + 'conditions': [ + ['OS=="mac"', { + 'xcode_settings': { + # Dead code stripping is normally enabled for release mode, + # but it causes mksnapshot to crash in some situations. + # http://code.google.com/p/v8/issues/detail?id=404 + 'DEAD_CODE_STRIPPING': 'NO', + }, + }], + ], + }, + }, 'dependencies': [ 'v8_nosnapshot', ], Index: src/version.cc =================================================================== --- src/version.cc (revision 2479) +++ src/version.cc (working copy) @@ -35,7 +35,7 @@ #define MAJOR_VERSION 1 #define MINOR_VERSION 2 #define BUILD_NUMBER 14 -#define PATCH_LEVEL 2 +#define PATCH_LEVEL 3 #define CANDIDATE_VERSION false // Define SONAME to have the SCons build the put a specific SONAME into the --~--~---------~--~----~------------~-------~--~----~ v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev -~----------~----~----~----~------~----~------~--~---
