summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@digia.com>2013-05-02 11:22:49 +0200
committerPierre Rossi <pierre.rossi@digia.com>2013-05-02 20:07:41 +0200
commit3a473000c6019ee5cd9320520e147c9b7f834890 (patch)
treedd835801d345a409cd21027510ec8f8c3c9457fe /build
parent259a919a30cbdf867d7e2fef9c7e0ecf7056661e (diff)
Fix Release vs. debug builds
We simply needed to specify the --toplevel-dir command line argument when invoking gyp in order to get a sane out directory structure again. Also update the README to reflect a bit better the current state of things.
Diffstat (limited to 'build')
-rwxr-xr-xbuild/gyp_blinq4
1 files changed, 4 insertions, 0 deletions
diff --git a/build/gyp_blinq b/build/gyp_blinq
index 8b68bbab1..43ab44e98 100755
--- a/build/gyp_blinq
+++ b/build/gyp_blinq
@@ -93,6 +93,10 @@ if __name__ == '__main__':
args.append('--no-circular-check')
args.extend(['-D', 'webkit_src_dir=' + chrome_src + '/third_party/WebKit'])
+ # the top_level source directory is the first common ancestor of our module and the chromium source tree for the build to be sane.
+ toplevel= os.path.commonprefix([root_dir, chrome_src])
+ args.extend(["--toplevel-dir=" + toplevel])
+ # Chromium specific Hack: for Chromium to build, the depth has to be set to the chromium src dir.
args.extend(["--depth=" + chrome_src])
args.extend(['-D', 'chromium_src_dir=' + chrome_src])
# Tweak the output location and format (hardcode ninja for now)