MIPS: Improve --rpath and --dynamic-linker handling in 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 320 matching lines @@
         'defines': [
           'V8_TARGET_ARCH_IA32',
         ],
       }],  # v8_target_arch=="ia32"
       ['v8_target_arch=="x87"', {
         'defines': [
           'V8_TARGET_ARCH_X87',
         ],
         'cflags': ['-march=i586'],
       }],  # v8_target_arch=="x87"
+      ['v8_target_arch==target_arch and (v8_target_arch=="mips" or \

[Jakob Kummerow, 2015/06/05 15:57:54]

nit: I'd prefer if you could reorder the conditions (checking "... and
v8_target_arch==target_arch" last), so it's quicker to see that this block is
MIPS specific.

+        v8_target_arch=="mipsel" or v8_target_arch=="mips64el")', {
+        'target_conditions': [
+          ['_toolset=="target"', {
+            # Target built with a Mips CXX compiler.
+            'variables': {
+              'ldso_path%': '<!(/bin/echo -n $LDSO_PATH)',
+              'ld_r_path%': '<!(/bin/echo -n $LD_R_PATH)',
+            },
+            'conditions': [
+              ['ldso_path!=""', {
+                'ldflags': ['-Wl,--dynamic-linker=<(ldso_path)'],
+              }],
+              ['ld_r_path!=""', {
+                'ldflags': ['-Wl,--rpath=<(ld_r_path)'],
+              }],
+            ],
+          }],
+        ]

[Jakob Kummerow, 2015/06/05 15:57:54]

nit: trailing ',' for consistency.

+      }],
       ['v8_target_arch=="mips"', {
         'defines': [
           'V8_TARGET_ARCH_MIPS',
         ],
         'conditions': [
           [ 'v8_can_use_fpu_instructions=="true"', {
             'defines': [
               'CAN_USE_FPU_INSTRUCTIONS',
             ],
           }],
@@ skipping 26 matching lines @@
                     'cflags': ['-msoft-float'],
                     'ldflags': ['-msoft-float'],
                   }],
                   ['mips_arch_variant=="r6"', {
                     'defines': [
                       '_MIPS_ARCH_MIPS32R6',
                       'FPU_MODE_FP64',
                     ],
                     'cflags!': ['-mfp32', '-mfpxx'],
                     'cflags': ['-mips32r6', '-Wa,-mips32r6'],
-                    'ldflags': [
-                      '-mips32r6',
-                      '-Wl,--dynamic-linker=$(LDSO_PATH)',
-                      '-Wl,--rpath=$(LD_R_PATH)',
-                    ],
+                    'ldflags': ['-mips32r6'],
                   }],
                   ['mips_arch_variant=="r2"', {
                     'conditions': [
                       [ 'mips_fpu_mode=="fp64"', {
                         'defines': [
                           '_MIPS_ARCH_MIPS32R2',
                           'FPU_MODE_FP64',
                         ],
                         'cflags': ['-mfp64'],
                       }],
@@ skipping 162 matching lines @@
                     'cflags': ['-msoft-float'],
                     'ldflags': ['-msoft-float'],
                   }],
                   ['mips_arch_variant=="r6"', {
                     'defines': [
                       '_MIPS_ARCH_MIPS32R6',
                       'FPU_MODE_FP64',
                     ],
                     'cflags!': ['-mfp32', '-mfpxx'],
                     'cflags': ['-mips32r6', '-Wa,-mips32r6'],
-                    'ldflags': [
-                      '-mips32r6',
-                      '-Wl,--dynamic-linker=$(LDSO_PATH)',
-                      '-Wl,--rpath=$(LD_R_PATH)',
-                    ],
+                    'ldflags': ['-mips32r6'],
                   }],
                   ['mips_arch_variant=="r2"', {
                     'conditions': [
                       [ 'mips_fpu_mode=="fp64"', {
                         'defines': [
                           '_MIPS_ARCH_MIPS32R2',
                           'FPU_MODE_FP64',
                         ],
                         'cflags': ['-mfp64'],
                       }],
@@ skipping 174 matching lines @@
                   [ 'v8_use_mips_abi_hardfloat=="true"', {
                     'cflags': ['-mhard-float'],
                     'ldflags': ['-mhard-float'],
                   }, {
                     'cflags': ['-msoft-float'],
                     'ldflags': ['-msoft-float'],
                   }],
                   ['mips_arch_variant=="r6"', {
                     'defines': ['_MIPS_ARCH_MIPS64R6',],
                     'cflags': ['-mips64r6', '-mabi=64', '-Wa,-mips64r6'],
-                    'ldflags': [
-                      '-mips64r6', '-mabi=64',
-                      '-Wl,--dynamic-linker=$(LDSO_PATH)',
-                      '-Wl,--rpath=$(LD_R_PATH)',
-                    ],
+                    'ldflags': ['-mips64r6', '-mabi=64'],
                   }],
                   ['mips_arch_variant=="r2"', {
                     'defines': ['_MIPS_ARCH_MIPS64R2',],
                     'cflags': ['-mips64r2', '-mabi=64', '-Wa,-mips64r2'],
-                    'ldflags': [
-                      '-mips64r2', '-mabi=64',
-                      '-Wl,--dynamic-linker=$(LDSO_PATH)',
-                      '-Wl,--rpath=$(LD_R_PATH)',
-                    ],
+                    'ldflags': ['-mips64r2', '-mabi=64'],
                   }],
                 ],
               }, {
                 # 'v8_target_arch!=target_arch'
                 # Target not built with an MIPS CXX compiler (simulator build).
                 'conditions': [
                   ['mips_arch_variant=="r6"', {
                     'defines': ['_MIPS_ARCH_MIPS64R6',],
                   }],
                   ['mips_arch_variant=="r2"', {
@@ skipping 451 matching lines @@
           ['v8_enable_slow_dchecks==1', {
             'defines': [
               'ENABLE_SLOW_DCHECKS',
             ],
           }],
         ],  # conditions
       },  # Release
     },  # configurations
   },  # target_defaults
 }