From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Thu, 25 Oct 2012 14:08:58 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/v0.8'
X-Git-Tag: v0.9.4~118
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9b61f570d86f994e9677d255c8fd413f38f4fe9c;p=platform%2Fupstream%2Fnodejs.git

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

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

9b61f570d86f994e9677d255c8fd413f38f4fe9c
diff --cc configure
index 1f13434,7211682..034f46a
--- a/configure
+++ b/configure
@@@ -172,11 -176,12 +172,17 @@@ parser.add_option("--with-arm-float-abi
      help="Specifies which floating-point ABI to use. Valid values are: "
           "soft, softfp, hard")
  
 +parser.add_option("--ninja",
 +    action="store_true",
 +    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,9 +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_install_waf'] = b(not options.without_waf)
+   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()