diff options
author | Zeno Albisser <zeno.albisser@digia.com> | 2013-06-27 14:02:47 +0200 |
---|---|---|
committer | Andras Becsi <andras.becsi@digia.com> | 2013-06-27 20:35:16 +0200 |
commit | 9d5c3ff62103708266d8bdc3a8fb02b07283d6b7 (patch) | |
tree | d323ab54bd0aac99f5aa01d81118c4ee830e7ae4 /build | |
parent | b2a20d9c65b35b33634f290cea2c038ed1801a6f (diff) |
Add Mac support.
Adding several patches to the repository that need
to be applied to the chromium sources in order to allow
building on Mac.
Change-Id: Ie06250a828b3533e2f48563ce374e63fc25d16cf
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'build')
-rwxr-xr-x | build/gyp_qtwebengine | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/build/gyp_qtwebengine b/build/gyp_qtwebengine index df5a5d18a..6c3f7c6aa 100755 --- a/build/gyp_qtwebengine +++ b/build/gyp_qtwebengine @@ -81,6 +81,12 @@ def get_output_dir(): if __name__ == '__main__': args = sys.argv[1:] + # On Mac we want to override CXX and CC that is provided with + # the Chromium GYP environment. + if sys.platform.startswith('darwin'): + os.environ['CXX'] = 'clang++' + os.environ['CC'] = 'clang' + gyp_helper.apply_chromium_gyp_env() # This could give false positives since it doesn't actually do real option @@ -96,6 +102,10 @@ if __name__ == '__main__': args.extend(['-I' + i for i in additional_include_files(args)]) + # On Mac we want to build in x64 mode. And we want to use libc++. + if sys.platform in ('darwin',): + args.extend(['-D', 'host_arch=x64', '-D', 'use_libcpp=1']) + # There shouldn't be a circular dependency relationship between .gyp files, # but in Chromium's .gyp files, on non-Mac platforms, circular relationships # currently exist. The check for circular dependencies is currently |