better insulate the flags where forcing 64 bits for solaris.

dothebart · dothebart · commit e2bf40a78adb · 2016-03-15T15:12:19.000+01:00
diff --git a/3rdParty/V8/V8-4.3.61/build/standalone.gypi b/3rdParty/V8/V8-4.3.61/build/standalone.gypi
@@ -325,6 +325,7 @@
       },
     }],
     ['OS=="solaris"', {'defines': ['_GLIBCXX_USE_C99_MATH']}],
+    ['OS=="solaris"', {'target_defaults': {'cflags': ['-m64']}}],
     ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
        or OS=="netbsd" or OS=="aix"', {
       'target_defaults': {
@@ -336,9 +337,8 @@
           '-pthread',
           '-fno-exceptions',
           '-pedantic',
-	  '-m64',
           # Don't warn about the "struct foo f = {0};" initialization pattern.
-          '-Wno-missing-field-initializers',
+          '-Wno-missing-field-initializers'
         ],
         'cflags_cc': [ '-Wnon-virtual-dtor', '-fno-rtti', '-std=gnu++11' ],
         'ldflags': [ '-pthread', '-march=x86-64', '-m64'],
diff --git a/3rdParty/V8/V8-4.3.61/build/toolchain.gypi b/3rdParty/V8/V8-4.3.61/build/toolchain.gypi
@@ -975,12 +975,13 @@
          or OS=="netbsd" or OS=="qnx" or OS=="aix"', {
         'conditions': [
           [ 'v8_no_strict_aliasing==1', {
-            'cflags': [ '-fno-strict-aliasing -m64' ],
+            'cflags': [ '-fno-strict-aliasing' ],
           }],
         ],  # conditions
       }],
       ['OS=="solaris"', {
         'defines': [ '__C99FEATURES__=1' ],  # isinf() etc.
+        'cflags': ['-m64']
       }],
       ['OS=="freebsd" or OS=="openbsd"', {
         'cflags': [ '-I/usr/local/include' ],
