ninja: Add target_rpath generator flag

pylib/gyp/generator/ninja.py

 # Copyright (c) 2013 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import collections
 import copy
 import hashlib
 import json
 import multiprocessing
 import os.path
@@ skipping 361 matching lines @@
     self.name = spec['target_name']
     self.toolset = spec['toolset']
     config = spec['configurations'][config_name]
     self.target = Target(spec['type'])
     self.is_standalone_static_library = bool(
         spec.get('standalone_static_library', 0))
     # Track if this target contains any C++ files, to decide if gcc or g++
     # should be used for linking.
     self.uses_cpp = False
 
+    self.target_rpath = generator_flags.get('target_rpath', r'\$$ORIGIN/lib/')

[sdefresne, 2016/03/18 14:12:40]

Instead of passing this as a generator flag, why not allow this to be
configurable in the .gyp files instead?

[Nico, 2016/03/18 14:17:49]

I feel that if you can get away with a less general thing, you should always do
that. Flexibility enables complexity. So if nobody needs this at a per-target
level, I wouldn't support it there.

[jbriance, 2016/03/18 14:20:37]

"output_dir" is a generator flag, so I thought this new "target_rpath" could be
a generator flag as well.
I also think that rpath is more a matter that should be up to the gyp caller. I
mean from same .gyp file, you might want two different rpath for two different
target systems.

[sdefresne, 2016/03/18 15:41:38]

Acknowdledged.

+
     self.is_mac_bundle = gyp.xcode_emulation.IsMacBundle(self.flavor, spec)
     self.xcode_settings = self.msvs_settings = None
     if self.flavor == 'mac':
       self.xcode_settings = gyp.xcode_emulation.XcodeSettings(spec)
     if self.flavor == 'win':
       self.msvs_settings = gyp.msvs_emulation.MsvsSettings(spec,
                                                            generator_flags)
       arch = self.msvs_settings.GetArch(config_name)
       self.ninja.variable('arch', self.win_env[arch])
       self.ninja.variable('cc', '$cl_' + arch)
@@ skipping 794 matching lines @@
       if def_file:
         implicit_deps.add(def_file)
     else:
       # Respect environment variables related to build, but target-specific
       # flags can still override them.
       ldflags = env_ldflags + config.get('ldflags', [])
       if is_executable and len(solibs):
         rpath = 'lib/'
         if self.toolset != 'target':
           rpath += self.toolset
-        ldflags.append(r'-Wl,-rpath=\$$ORIGIN/%s' % rpath)
+          ldflags.append(r'-Wl,-rpath=\$$ORIGIN/%s' % rpath)
+        else:
+          ldflags.append('-Wl,-rpath=%s' % self.target_rpath)
         ldflags.append('-Wl,-rpath-link=%s' % rpath)
     self.WriteVariableList(ninja_file, 'ldflags',
                            map(self.ExpandSpecial, ldflags))
 
     library_dirs = config.get('library_dirs', [])
     if self.flavor == 'win':
       library_dirs = [self.msvs_settings.ConvertVSMacros(l, config_name)
                       for l in library_dirs]
       library_dirs = ['/LIBPATH:' + QuoteShellArgument(self.GypPathToNinja(l),
                                                        self.flavor)
@@ skipping 1211 matching lines @@
           arglists.append(
               (target_list, target_dicts, data, params, config_name))
         pool.map(CallGenerateOutputForConfig, arglists)
       except KeyboardInterrupt, e:
         pool.terminate()
         raise e
     else:
       for config_name in config_names:
         GenerateOutputForConfig(target_list, target_dicts, data, params,
                                 config_name)