From f109f936505d2fcc0add71509d3ac73d66032f2c Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 27 Nov 2015 10:42:39 +0100 Subject: Set -no-duplicate-basename MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- tools/buildscripts/gyp_qtwebengine | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'tools/buildscripts') 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), -- cgit v1.2.3