Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nodejs/node.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Noordhuis <info@bnoordhuis.nl>2012-07-03 17:28:06 +0400
committerBen Noordhuis <info@bnoordhuis.nl>2012-07-03 17:28:45 +0400
commitb1cce046467f7fb64710160c5122a7883b739729 (patch)
tree0bdd4b32a6a95bf170740f7e2d625b1cb9325fee
parentb731c96679247a5dec9b2ed1470cc6c4feea2d1c (diff)
build: rename strict_aliasing to node_no_strict_aliasing
Make the variable naming consistent with the other strict aliasing var, v8_no_strict_aliasing.
-rw-r--r--common.gypi4
-rwxr-xr-xconfigure6
2 files changed, 5 insertions, 5 deletions
diff --git a/common.gypi b/common.gypi
index ca0cf9f3e16..8d604141857 100644
--- a/common.gypi
+++ b/common.gypi
@@ -1,6 +1,6 @@
{
'variables': {
- 'strict_aliasing%': 'false', # turn on/off -fstrict-aliasing
+ 'node_no_strict_aliasing%': 0, # turn off -fstrict-aliasing
'visibility%': 'hidden', # V8's visibility setting
'target_arch%': 'ia32', # set v8's target architecture
'host_arch%': 'ia32', # set v8's host architecture
@@ -52,7 +52,7 @@
# pull in V8's postmortem metadata
'ldflags': [ '-Wl,-z,allextract' ]
}],
- ['strict_aliasing!="true"', {
+ ['node_no_strict_aliasing==1', {
'cflags': [ '-fno-strict-aliasing' ],
}],
],
diff --git a/configure b/configure
index 4ad4e482435..d324696f40d 100755
--- a/configure
+++ b/configure
@@ -287,9 +287,9 @@ def configure_node(o):
# turn off strict aliasing if gcc < 4.6.0 unless it's llvm-gcc
# see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=45883
# see http://code.google.com/p/v8/issues/detail?id=884
- strict_aliasing = is_clang or cc_version >= (4,6,0)
- o['variables']['strict_aliasing'] = b(strict_aliasing)
- o['variables']['v8_no_strict_aliasing'] = b(not strict_aliasing)
+ no_strict_aliasing = int(not(is_clang or cc_version >= (4,6,0)))
+ o['variables']['v8_no_strict_aliasing'] = no_strict_aliasing
+ o['variables']['node_no_strict_aliasing'] = no_strict_aliasing
# clang has always supported -fvisibility=hidden, right?
if not is_clang and cc_version < (4,0,0):