diff options
| author | Pierre Rossi <pierre.rossi@digia.com> | 2013-05-13 16:25:46 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@digia.com> | 2014-06-04 18:19:14 +0200 |
| commit | b2bb11d26c98c6e951d1e492a45017b0ac5bdb25 (patch) | |
| tree | 21748c4771f9e63527fb64cf3304dc4dcb00f148 | |
| parent | 3394f35a8ddf19372cd6b2fec6475c9759dadca2 (diff) | |
| download | qtwebengine-chromium-b2bb11d26c98c6e951d1e492a45017b0ac5bdb25.tar.gz | |
<tools/gyp> Fix build with toplevel-dir
Change-Id: I3fcbf166978cf20f7a07d7e6bda135864054e9c1
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
| -rw-r--r-- | chromium/tools/gyp/pylib/gyp/generator/ninja.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chromium/tools/gyp/pylib/gyp/generator/ninja.py b/chromium/tools/gyp/pylib/gyp/generator/ninja.py index a40c7fe2464..a1692348873 100644 --- a/chromium/tools/gyp/pylib/gyp/generator/ninja.py +++ b/chromium/tools/gyp/pylib/gyp/generator/ninja.py @@ -1473,8 +1473,13 @@ def CalculateVariables(default_variables, params): default_variables.setdefault('SHARED_LIB_SUFFIX', '.so') default_variables.setdefault('SHARED_LIB_DIR', os.path.join('$!PRODUCT_DIR', 'lib')) + # Take into account the fact that toplevel_dir might not be equal to depth + toplevel_offset = '' + if 'options' in params: + options = params['options'] + toplevel_offset = os.path.relpath(options.depth, options.toplevel_dir) default_variables.setdefault('LIB_DIR', - os.path.join('$!PRODUCT_DIR', 'obj')) + os.path.join('$!PRODUCT_DIR', 'obj', toplevel_offset)) def ComputeOutputDir(params): """Returns the path from the toplevel_dir to the build output directory.""" |