summaryrefslogtreecommitdiffstats
path: root/tools/buildscripts
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-11-27 10:42:39 +0100
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-12-01 14:38:38 +0000
commitf109f936505d2fcc0add71509d3ac73d66032f2c (patch)
tree079d0bcdb66b4cec8b3cc2e97732595025ff1238 /tools/buildscripts
parentb0967d67606b7add15b50e1b3fc46db4d613a081 (diff)
Set -no-duplicate-basename
Add another gyp flag from gyp_chromium.py, this is needed on some non-x86 platforms in particular AArch64. Change-Id: Id9ca1490d0e8637e52cec53c40e9bc40403501f2 Reviewed-by: Michael BrĂ¼ning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'tools/buildscripts')
-rwxr-xr-xtools/buildscripts/gyp_qtwebengine8
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/buildscripts/gyp_qtwebengine b/tools/buildscripts/gyp_qtwebengine
index ce2a43328..c8e849973 100755
--- a/tools/buildscripts/gyp_qtwebengine
+++ b/tools/buildscripts/gyp_qtwebengine
@@ -133,6 +133,14 @@ if __name__ == '__main__':
if sys.platform not in ('darwin',) or 'GYP_CROSSCOMPILE' in os.environ:
args.append('--no-circular-check')
+ # libtool on Mac warns about duplicate basenames in static libraries, so
+ # they're disallowed in general by gyp. We are lax on this point, so disable
+ # this check other than on Mac. GN does not use static libraries as heavily,
+ # so over time this restriction will mostly go away anyway, even on Mac.
+ # https://code.google.com/p/gyp/issues/detail?id=384
+ if sys.platform != 'darwin':
+ args.append('--no-duplicate-basename-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.
# commonprefix works on a character basis, so it might return a phony common prefix (not the common parent directory we expect),