diff options
author | Ben Noordhuis <info@bnoordhuis.nl> | 2012-10-25 16:08:58 +0200 |
---|---|---|
committer | Ben Noordhuis <info@bnoordhuis.nl> | 2012-10-25 16:08:58 +0200 |
commit | 9b61f570d86f994e9677d255c8fd413f38f4fe9c (patch) | |
tree | d62da0c8f8bb8b424530b1ee395d83cf5ff8078d /deps/v8 | |
parent | fa94f0fe8338fcd7832a1146a4d847b27dea9a55 (diff) | |
parent | 4b8629db3717a587a44b373cd10351e005b190f3 (diff) | |
download | node-9b61f570d86f994e9677d255c8fd413f38f4fe9c.tar.gz |
Merge remote-tracking branch 'origin/v0.8'
Conflicts:
configure
deps/v8/build/common.gypi
Diffstat (limited to 'deps/v8')
-rw-r--r-- | deps/v8/build/common.gypi | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/deps/v8/build/common.gypi b/deps/v8/build/common.gypi index 45b6b4820..7997c54d3 100644 --- a/deps/v8/build/common.gypi +++ b/deps/v8/build/common.gypi @@ -367,15 +367,6 @@ 'conditions': [ ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" \ or OS=="android"', { - 'cflags!': [ - '-O2', - '-Os', - ], - 'cflags': [ - '-fdata-sections', - '-ffunction-sections', - '-O3', - ], 'conditions': [ [ 'gcc_version==44 and clang==0', { 'cflags': [ |