summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2017-11-27 20:09:12 +0100
committerMichal Klocek <michal.klocek@qt.io>2017-11-28 10:44:25 +0000
commitbd86d84bf50c43959e6fd39c905b3b00d3629041 (patch)
tree840ce330bcaeb9b9d6c3fa11c555fd28efa87bae
parenta8a987b07ea13d07eeb8e92bc947a93e0c64221c (diff)
downloadqtwebengine-chromium-bd86d84bf50c43959e6fd39c905b3b00d3629041.tar.gz
Do not pick up CFLAGS,CXXFLAGS,LDFLAGS for gn bootstrap
Task-number: QTBUG-64759 Change-Id: Ifd366e496ce08365f63216943f93864fc285b8b0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rwxr-xr-xchromium/tools/gn/bootstrap/bootstrap.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/chromium/tools/gn/bootstrap/bootstrap.py b/chromium/tools/gn/bootstrap/bootstrap.py
index 2eee67dfe50..b1ff7e78573 100755
--- a/chromium/tools/gn/bootstrap/bootstrap.py
+++ b/chromium/tools/gn/bootstrap/bootstrap.py
@@ -323,9 +323,14 @@ def write_gn_ninja(path, root_gen_dir, options):
ld = cxx
ar = os.environ.get('AR', 'ar')
- cflags = os.environ.get('CFLAGS', '').split()
- cflags_cc = os.environ.get('CXXFLAGS', '').split()
- ldflags = os.environ.get('LDFLAGS', '').split()
+ # QTBUG-64759
+ # cflags = os.environ.get('CFLAGS', '').split()
+ # cflags_cc = os.environ.get('CXXFLAGS', '').split()
+ # ldflags = os.environ.get('LDFLAGS', '').split()
+ cflags = []
+ cflags_cc = []
+ ldflags = []
+
include_dirs = [root_gen_dir, SRC_ROOT]
libs = []