diff options
author | Ryan Dahl <ry@tinyclouds.org> | 2011-04-03 23:42:56 -0700 |
---|---|---|
committer | Ryan Dahl <ry@tinyclouds.org> | 2011-04-03 23:42:56 -0700 |
commit | bfa9db9dd6a13af475f256bb1d95118ac38f8590 (patch) | |
tree | 54ee44653582ff37f75e1fca37ad0ab7d9eb1373 /wscript | |
parent | 7ee8c5676b5fe5ef1b5229e4affc45a97cccc6eb (diff) | |
parent | dcc2dd5e1fa7709f592c25dd91b9c2e18bbaca11 (diff) | |
download | node-new-bfa9db9dd6a13af475f256bb1d95118ac38f8590.tar.gz |
Merge branch 'v0.4'
Conflicts:
src/node_version.h
test/simple/test-buffer.js
Diffstat (limited to 'wscript')
-rw-r--r-- | wscript | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -603,7 +603,9 @@ def v8_cmd(bld, variant): if bld.env["USE_GDBJIT"]: cmd += ' gdbjit=on ' - if sys.platform.startswith("sunos"): cmd += ' toolchain=gcc' + if sys.platform.startswith("sunos"): + cmd += ' toolchain=gcc strictaliasing=off' + return ("echo '%s' && " % cmd) + cmd @@ -885,7 +887,7 @@ def build(bld): , 'CPPFLAGS' : " ".join(program.env["CPPFLAGS"]).replace('"', '\\"') , 'LIBFLAGS' : " ".join(program.env["LIBFLAGS"]).replace('"', '\\"') , 'PREFIX' : safe_path(program.env["PREFIX"]) - , 'VERSION' : '0.4.3' # FIXME should not be hard-coded, see NODE_VERSION_STRING in src/node_version. + , 'VERSION' : '0.4.5' # FIXME should not be hard-coded, see NODE_VERSION_STRING in src/node_version. } return x |