Author: [email protected]
Date: Thu Jul 16 00:56:22 2009
New Revision: 2480
Modified:
branches/1.2/src/version.cc
branches/1.2/tools/gyp/v8.gyp
Log:
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.
Review URL: http://codereview.chromium.org/149747
Modified: branches/1.2/src/version.cc
==============================================================================
--- branches/1.2/src/version.cc (original)
+++ branches/1.2/src/version.cc Thu Jul 16 00:56:22 2009
@@ -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
Modified: branches/1.2/tools/gyp/v8.gyp
==============================================================================
--- branches/1.2/tools/gyp/v8.gyp (original)
+++ branches/1.2/tools/gyp/v8.gyp Thu Jul 16 00:56:22 2009
@@ -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',
],
--~--~---------~--~----~------------~-------~--~----~
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
-~----------~----~----~----~------~----~------~--~---
