summaryrefslogtreecommitdiffstats
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>2018-08-31 17:37:38 +0200
commitf1655b5836db039a1f134e8f5f6deff79576afc0 (patch)
tree7574a2c9832ab519d5c2b70a189f5c96d57b319c
parent07fc591115bde26eb348f4aa1b28c6c5ef74634a (diff)
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-xgn/build/gen.py13
1 files changed, 9 insertions, 4 deletions
diff --git a/gn/build/gen.py b/gn/build/gen.py
index b224d804c78..82cca32b313 100755
--- a/gn/build/gen.py
+++ b/gn/build/gen.py
@@ -315,10 +315,15 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot):
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()
- libflags = os.environ.get('LIBFLAGS', '').split()
+ # QTBUG-64759
+ # cflags = os.environ.get('CFLAGS', '').split()
+ # cflags_cc = os.environ.get('CXXFLAGS', '').split()
+ # ldflags = os.environ.get('LDFLAGS', '').split()
+ # libflags = os.environ.get('LIBFLAGS', '').split()
+ cflags = []
+ cflags_cc = []
+ ldflags = []
+ libflags = []
include_dirs = [REPO_ROOT, os.path.dirname(path)]
libs = []