Revert "Remove erroneous uses of CXX / CXX_target / CXX_host from gyp."

build/toolchain.gypi

 # Copyright 2013 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 13 matching lines @@
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Shared definitions for all V8-related targets.
 
 {
   'variables': {
     'msvs_use_common_release': 0,
     'gcc_version%': 'unknown',
-    'clang%': 0,
+    'CXX%': '${CXX:-$(which g++)}',  # Used to assemble a shell command.
     'v8_target_arch%': '<(target_arch)',
     # Native Client builds currently use the V8 ARM JIT and
     # arm/simulator-arm.cc to defer the significant effort required
     # for NaCl JIT support. The nacl_target_arch variable provides
     # the 'true' target arch for places in this file that need it.
     # TODO(bradchen): get rid of nacl_target_arch when someday
     # NaCl V8 builds stop using the ARM simulator
     'nacl_target_arch%': 'none',     # must be set externally
 
     # Setting 'v8_can_use_vfp32dregs' to 'true' will cause V8 to use the VFP
@@ skipping 31 matching lines @@
     'v8_toolset_for_d8%': 'target',
 
     'host_os%': '<(OS)',
     'werror%': '-Werror',
     # For a shared library build, results in "libv8-<(soname_version).so".
     'soname_version%': '',
 
     # Allow to suppress the array bounds warning (default is no suppression).
     'wno_array_bounds%': '',
   },
-  'conditions': [
-    ['host_arch=="ia32" or host_arch=="x64" or clang==1', {
-      'variables': {
-        'host_cxx_is_biarch%': 1,
-       },
-     }, {
-      'variables': {
-        'host_cxx_is_biarch%': 0,
-      },
-    }],
-    ['target_arch=="ia32" or target_arch=="x64" or target_arch=="x87" or \
-      clang==1', {
-      'variables': {
-        'target_cxx_is_biarch%': 1,
-       },
-     }, {
-      'variables': {
-        'target_cxx_is_biarch%': 0,
-      },
-    }],
-  ],
   'target_defaults': {
     'conditions': [
       ['v8_target_arch=="arm"', {
         'defines': [
           'V8_TARGET_ARCH_ARM',
         ],
         'conditions': [
           [ 'arm_version==7 or arm_version=="default"', {
             'defines': [
               'CAN_USE_ARMV7_INSTRUCTIONS',
@@ skipping 18 matching lines @@
             ],
           }],
           [ 'arm_test_noprobe=="on"', {
             'defines': [
               'ARM_TEST_NO_FEATURE_PROBE',
             ],
           }],
         ],
         'target_conditions': [
           ['_toolset=="host"', {
+            'variables': {
+              'armcompiler': '<!($(echo ${CXX_host:-$(which g++)}) -v 2>&1 | grep -q "^Target: arm" && echo "yes" || echo "no")',
+            },
             'conditions': [
-              ['v8_target_arch==host_arch', {
-                # Host built with an Arm CXX compiler.
+              ['armcompiler=="yes"', {
                 'conditions': [
                   [ 'arm_version==7', {
                     'cflags': ['-march=armv7-a',],
                   }],
                   [ 'arm_version==7 or arm_version=="default"', {
                     'conditions': [
                       [ 'arm_fpu!="default"', {
                         'cflags': ['-mfpu=<(arm_fpu)',],
                       }],
                     ],
                   }],
                   [ 'arm_float_abi!="default"', {
                     'cflags': ['-mfloat-abi=<(arm_float_abi)',],
                   }],
                   [ 'arm_thumb==1', {
                     'cflags': ['-mthumb',],
                   }],
                   [ 'arm_thumb==0', {
                     'cflags': ['-marm',],
                   }],
                 ],
               }, {
-                # 'v8_target_arch!=host_arch'
-                # Host not built with an Arm CXX compiler (simulator build).
+                # armcompiler=="no"
                 'conditions': [
                   [ 'arm_float_abi=="hard"', {
                     'defines': [
                       'USE_EABI_HARDFLOAT=1',
                     ],
                   }],
                   [ 'arm_float_abi=="softfp" or arm_float_abi=="default"', {
                     'defines': [
                       'USE_EABI_HARDFLOAT=0',
                     ],
                   }],
                 ],
               }],
             ],
           }],  # _toolset=="host"
           ['_toolset=="target"', {
+            'variables': {
+              'armcompiler': '<!($(echo ${CXX_target:-<(CXX)}) -v 2>&1 | grep -q "^Target: arm" && echo "yes" || echo "no")',
+            },
             'conditions': [
-              ['v8_target_arch==target_arch', {
-                # Target built with an Arm CXX compiler.
+              ['armcompiler=="yes"', {
                 'conditions': [
                   [ 'arm_version==7', {
                     'cflags': ['-march=armv7-a',],
                   }],
                   [ 'arm_version==7 or arm_version=="default"', {
                     'conditions': [
                       [ 'arm_fpu!="default"', {
                         'cflags': ['-mfpu=<(arm_fpu)',],
                       }],
                     ],
                   }],
                   [ 'arm_float_abi!="default"', {
                     'cflags': ['-mfloat-abi=<(arm_float_abi)',],
                   }],
                   [ 'arm_thumb==1', {
                     'cflags': ['-mthumb',],
                   }],
                   [ 'arm_thumb==0', {
                     'cflags': ['-marm',],
                   }],
                 ],
               }, {
-                # 'v8_target_arch!=target_arch'
-                # Target not built with an Arm CXX compiler (simulator build).
+                # armcompiler=="no"
                 'conditions': [
                   [ 'arm_float_abi=="hard"', {
                     'defines': [
                       'USE_EABI_HARDFLOAT=1',
                     ],
                   }],
                   [ 'arm_float_abi=="softfp" or arm_float_abi=="default"', {
                     'defines': [
                       'USE_EABI_HARDFLOAT=0',
                     ],
@@ skipping 17 matching lines @@
       ['v8_target_arch=="x87"', {
         'defines': [
           'V8_TARGET_ARCH_X87',
         ],
         'cflags': ['-march=i586'],
       }],  # v8_target_arch=="x87"
       ['v8_target_arch=="mips"', {
         'defines': [
           'V8_TARGET_ARCH_MIPS',
         ],
+        'variables': {
+          'mipscompiler': '<!($(echo <(CXX)) -v 2>&1 | grep -q "^Target: mips" && echo "yes" || echo "no")',
+        },
         'conditions': [
-          ['v8_target_arch==target_arch', {
-            # Target built with a Mips CXX compiler.
+          ['mipscompiler=="yes"', {
             'target_conditions': [
               ['_toolset=="target"', {
                 'cflags': ['-EB'],
                 'ldflags': ['-EB'],
                 'conditions': [
                   [ 'v8_use_mips_abi_hardfloat=="true"', {
                     'cflags': ['-mhard-float'],
                     'ldflags': ['-mhard-float'],
                   }, {
                     'cflags': ['-msoft-float'],
@@ skipping 26 matching lines @@
           }],
           ['mips_arch_variant=="r2"', {
             'defines': ['_MIPS_ARCH_MIPS32R2',],
           }],
         ],
       }],  # v8_target_arch=="mips"
       ['v8_target_arch=="mipsel"', {
         'defines': [
           'V8_TARGET_ARCH_MIPS',
         ],
+        'variables': {
+          'mipscompiler': '<!($(echo <(CXX)) -v 2>&1 | grep -q "^Target: mips" && echo "yes" || echo "no")',
+        },
         'conditions': [
-          ['v8_target_arch==target_arch', {
-            # Target built with a Mips CXX compiler.
+          ['mipscompiler=="yes"', {
             'target_conditions': [
               ['_toolset=="target"', {
                 'cflags': ['-EL'],
                 'ldflags': ['-EL'],
                 'conditions': [
                   [ 'v8_use_mips_abi_hardfloat=="true"', {
                     'cflags': ['-mhard-float'],
                     'ldflags': ['-mhard-float'],
                   }, {
                     'cflags': ['-msoft-float'],
@@ skipping 32 matching lines @@
           }],
           ['mips_arch_variant=="loongson"', {
             'defines': ['_MIPS_ARCH_LOONGSON',],
           }],
         ],
       }],  # v8_target_arch=="mipsel"
       ['v8_target_arch=="mips64el"', {
         'defines': [
           'V8_TARGET_ARCH_MIPS64',
         ],
+        'variables': {
+          'mipscompiler': '<!($(echo <(CXX)) -v 2>&1 | grep -q "^Target: mips" && echo "yes" || echo "no")',
+        },
         'conditions': [
-          ['v8_target_arch==target_arch', {
-            # Target built with a Mips CXX compiler.
+          ['mipscompiler=="yes"', {
             'target_conditions': [
               ['_toolset=="target"', {
                 'cflags': ['-EL'],
                 'ldflags': ['-EL'],
                 'conditions': [
                   [ 'v8_use_mips_abi_hardfloat=="true"', {
                     'cflags': ['-mhard-float'],
                     'ldflags': ['-mhard-float'],
                   }, {
                     'cflags': ['-msoft-float'],
@@ skipping 76 matching lines @@
           'CharacterSet': '1',
         },
       }],
       ['OS=="win" and v8_enable_prof==1', {
         'msvs_settings': {
           'VCLinkerTool': {
             'GenerateMapFile': 'true',
           },
         },
       }],
-      ['(OS=="linux" or OS=="freebsd"  or OS=="openbsd" or OS=="solaris" \
+      ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
+         or OS=="netbsd" or OS=="qnx"', {
+        'conditions': [
+          [ 'v8_no_strict_aliasing==1', {
+            'cflags': [ '-fno-strict-aliasing' ],
+          }],
+        ],  # conditions
+      }],
+      ['OS=="solaris"', {
+        'defines': [ '__C99FEATURES__=1' ],  # isinf() etc.
+      }],
+      ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
          or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \
-        (v8_target_arch=="arm" or v8_target_arch=="ia32" or \
-         v8_target_arch=="x87" or v8_target_arch=="mips" or \
-         v8_target_arch=="mipsel")', {
+        (v8_target_arch=="arm" or v8_target_arch=="ia32" or v8_target_arch=="x87" or\
+         v8_target_arch=="mips" or v8_target_arch=="mipsel")', {
+        # Check whether the host compiler and target compiler support the
+        # '-m32' option and set it if so.
         'target_conditions': [
           ['_toolset=="host"', {
-            'conditions': [
-              ['host_cxx_is_biarch==1', {
-                'cflags': [ '-m32' ],
-                'ldflags': [ '-m32' ]
-              }],
-            ],
+            'variables': {
+              'm32flag': '<!(($(echo ${CXX_host:-$(which g++)}) -m32 -E - > /dev/null 2>&1 < /dev/null) && echo "-m32" || true)',
+            },
+            'cflags': [ '<(m32flag)' ],
+            'ldflags': [ '<(m32flag)' ],
             'xcode_settings': {
               'ARCHS': [ 'i386' ],
             },
           }],
           ['_toolset=="target"', {
+            'variables': {
+              'm32flag': '<!(($(echo ${CXX_target:-<(CXX)}) -m32 -E - > /dev/null 2>&1 < /dev/null) && echo "-m32" || true)',
+              'clang%': 0,
+            },
             'conditions': [
-              ['target_cxx_is_biarch==1 and nacl_target_arch!="nacl_x64"', {
-                'cflags': [ '-m32' ],
-                'ldflags': [ '-m32' ],
+              ['((OS!="android" and OS!="qnx") or clang==1) and \
+                nacl_target_arch!="nacl_x64"', {
+                'cflags': [ '<(m32flag)' ],
+                'ldflags': [ '<(m32flag)' ],
               }],
             ],
             'xcode_settings': {
               'ARCHS': [ 'i386' ],
             },
           }],
         ],
       }],
       ['(OS=="linux" or OS=="android") and \
         (v8_target_arch=="x64" or v8_target_arch=="arm64")', {
+        # Check whether the host compiler and target compiler support the
+        # '-m64' option and set it if so.
         'target_conditions': [
           ['_toolset=="host"', {
+            'variables': {
+              'm64flag': '<!(($(echo ${CXX_host:-$(which g++)}) -m64 -E - > /dev/null 2>&1 < /dev/null) && echo "-m64" || true)',
+            },
+            'cflags': [ '<(m64flag)' ],
+            'ldflags': [ '<(m64flag)' ],
+          }],
+          ['_toolset=="target"', {
+            'variables': {
+              'm64flag': '<!(($(echo ${CXX_target:-<(CXX)}) -m64 -E - > /dev/null 2>&1 < /dev/null) && echo "-m64" || true)',
+            },
             'conditions': [
-              ['host_cxx_is_biarch==1', {
-                'cflags': [ '-m64' ],
-                'ldflags': [ '-m64' ]
+              ['((OS!="android" and OS!="qnx") or clang==1)', {
+                'cflags': [ '<(m64flag)' ],
+                'ldflags': [ '<(m64flag)' ],
               }],
-             ],
-           }],
-           ['_toolset=="target"', {
-             'conditions': [
-               ['target_cxx_is_biarch==1', {
-                 'cflags': [ '-m64' ],
-                 'ldflags': [ '-m64' ],
-               }],
-             ]
-           }],
-         ],
-      }],
-      ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
-         or OS=="netbsd" or OS=="qnx"', {
-        'conditions': [
-          [ 'v8_no_strict_aliasing==1', {
-            'cflags': [ '-fno-strict-aliasing' ],
-          }],
-        ],  # conditions
-      }],
-      ['OS=="solaris"', {
-        'defines': [ '__C99FEATURES__=1' ],  # isinf() etc.
+            ],
+          }]
+        ],
       }],
       ['OS=="freebsd" or OS=="openbsd"', {
         'cflags': [ '-I/usr/local/include' ],
       }],
       ['OS=="netbsd"', {
         'cflags': [ '-I/usr/pkg/include' ],
       }],
     ],  # conditions
     'configurations': {
       # Abstract configuration for v8_optimized_debug == 0.
@@ skipping 291 matching lines @@
                 'OptimizeReferences': '2',
                 'EnableCOMDATFolding': '2',
               },
             },
           }],  # OS=="win"
         ],  # conditions
       },  # Release
     },  # configurations
   },  # target_defaults
 }