Merge remote-tracking branch 'origin/v0.8'

Conflicts:
	configure
	deps/v8/build/common.gypi

1 files changed, 8 insertions, 0 deletions

diff --git a/configure b/configure
index 1f1343441a..034f46af25 100755
--- a/configure
+++ b/configure
@@ -177,6 +177,12 @@ parser.add_option("--ninja",
     dest="use_ninja",
     help="Generate files for the ninja build system")
 
+# Using --unsafe-optimizations voids your warranty.
+parser.add_option("--unsafe-optimizations",
+    action="store_true",
+    dest="unsafe_optimizations",
+    help=optparse.SUPPRESS_HELP)
+
 (options, args) = parser.parse_args()
 
 
@@ -344,6 +350,8 @@ def configure_node(o):
   o['variables']['v8_no_strict_aliasing'] = 1 # work around compiler bugs
   o['variables']['node_prefix'] = os.path.expanduser(options.prefix or '')
   o['variables']['node_install_npm'] = b(not options.without_npm)
+  o['variables']['node_unsafe_optimizations'] = (
+    1 if options.unsafe_optimizations else 0)
   o['default_configuration'] = 'Debug' if options.debug else 'Release'
 
   host_arch = host_arch_win() if os.name == 'nt' else host_arch_cc()