aboutsummaryrefslogtreecommitdiffstats
path: root/build_scripts/setup_runner.py
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2020-10-14 20:34:46 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2020-10-14 20:34:46 +0200
commit68ec9c643abf30cf22b9932ec82098cdebc08b98 (patch)
tree18e6db70e971b3e437145183d07ed017933ab64d /build_scripts/setup_runner.py
parent30724622333ffc8bce61f7e19217977eebbf9564 (diff)
parentb0da5a06e147b02af0bf2d69364e3bfcc04327d5 (diff)
Merge remote-tracking branch 'origin/5.15' into dev
Diffstat (limited to 'build_scripts/setup_runner.py')
-rw-r--r--build_scripts/setup_runner.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/build_scripts/setup_runner.py b/build_scripts/setup_runner.py
index b54c62796..6b944c2c8 100644
--- a/build_scripts/setup_runner.py
+++ b/build_scripts/setup_runner.py
@@ -46,13 +46,11 @@ import distutils.log as log
from build_scripts.config import config
from build_scripts.main import get_package_version, get_setuptools_extension_modules
from build_scripts.main import cmd_class_dict
-from build_scripts.options import OPTION
+from build_scripts.options import ADDITIONAL_OPTIONS, OPTION
from build_scripts.utils import run_process
from setuptools import setup
-if OPTION["VERBOSE_BUILD"]:
- log.set_verbosity(1)
class SetupRunner(object):
@@ -166,6 +164,10 @@ class SetupRunner(object):
""").format(exit_code, cmd_as_string)
raise RuntimeError(msg)
+ if help_requested:
+ print(ADDITIONAL_OPTIONS)
+
+
@staticmethod
def run_setuptools_setup():
"""