summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2017-11-27 20:09:12 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-12-05 17:04:19 +0100
commita95607c23d7153e018d92184dcf37a1dad4e8e82 (patch)
tree26726284875f1818431ac9da71289442f3356e1b
parentcab37743e0543d3589e0727f91e8416d7341700e (diff)
downloadqtwebengine-chromium-a95607c23d7153e018d92184dcf37a1dad4e8e82.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 e2f564988b8..d27e4e7b1e0 100755
--- a/chromium/tools/gn/bootstrap/bootstrap.py
+++ b/chromium/tools/gn/bootstrap/bootstrap.py
@@ -331,9 +331,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 = []