From 692c03ffe2bd7033dc2e31163095efebace7e642 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 16 Dec 2015 19:07:14 -0800 Subject: Merge to XFA: Make clang_warning_flags work for standalone builds. Also fix a newly introduced override warning. Also define a host_clang GYP variable. TBR=thakis@chromium.org Review URL: https://codereview.chromium.org/1532723003 . Review URL: https://codereview.chromium.org/1533763002 . (cherry picked from commit e096ca507db9944aebc47d6c2cc1c6fab39498c5) (cherry picked from commit 0a9158b99a2002fb82301ebec20dbc23b3fc084c) Review URL: https://codereview.chromium.org/1535603003 . --- build/standalone.gypi | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'build/standalone.gypi') diff --git a/build/standalone.gypi b/build/standalone.gypi index 2eac19882c..de638de97c 100644 --- a/build/standalone.gypi +++ b/build/standalone.gypi @@ -59,8 +59,10 @@ }], ['OS=="linux" or OS=="mac"', { 'clang%': 1, + 'host_clang%': 1, }, { 'clang%': 0, + 'host_clang%': 0, }], # Set default gomadir. ['OS=="win"', { @@ -261,6 +263,10 @@ '-Wno-unused-parameter', ], }, + 'variables': { + 'clang_warning_flags': [], + }, + 'includes': [ 'set_clang_warning_flags.gypi', ], 'conditions': [ ['component=="shared_library"', { 'cflags': [ -- cgit v1.2.3