diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 17:06:49 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-03 08:24:34 +0000 |
| commit | e62bec6f5e96d7ce8a09693b7bebb2833d8fe03e (patch) | |
| tree | dbb1a9458a2ca874efe093b1fbbea53e81b87c5e | |
| parent | f1655b5836db039a1f134e8f5f6deff79576afc0 (diff) | |
Fix GN building for non Google
Change-Id: I155b86c54755080e4dc33e2efa9447fbf38ace7d
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| -rwxr-xr-x | gn/build/gen.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gn/build/gen.py b/gn/build/gen.py index 82cca32b313..37ea3ad4d92 100755 --- a/gn/build/gen.py +++ b/gn/build/gen.py @@ -87,8 +87,8 @@ def main(argv): help='Enable the use of LTO') parser.add_option('--use-icf', action='store_true', help='Enable the use of Identical Code Folding') - parser.add_option('--no-sysroot', action='store_true', - help='(Linux only) Do not build with the Debian sysroot.') + parser.add_option('--sysroot', action='store_true', + help='(Linux only) Build with a Debian sysroot.') parser.add_option('--no-last-commit-position', action='store_true', help='Do not generate last_commit_position.h.') parser.add_option('--out-path', @@ -105,7 +105,7 @@ def main(argv): host = platform linux_sysroot = None - if platform.is_linux() and not options.no_sysroot: + if platform.is_linux() and options.sysroot: linux_sysroot = UpdateLinuxSysroot() out_dir = options.out_path or os.path.join(REPO_ROOT, 'out') @@ -310,8 +310,8 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot): ld = os.environ.get('LD', 'g++') ar = os.environ.get('AR', 'ar -X64') else: - cc = os.environ.get('CC', 'clang') - cxx = os.environ.get('CXX', 'clang++') + cc = os.environ.get('CC', 'cc') + cxx = os.environ.get('CXX', 'c++') ld = cxx ar = os.environ.get('AR', 'ar') |