Export sanitizer as a global config

This is necessary for WebEngine at configure time, to be able to query
which of the sanitizers was enabled in order to report unsupported
combinations.

Task-number: QTBUG-64726
Change-Id: I72f8efe4bed3e14114f885bdae16650f1f23b24b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
Alexandru Croitor 2017-12-14 16:23:22 +01:00
parent 7f5a314011
commit e557a3c1d3
2 changed files with 14 additions and 1 deletions

View File

@ -867,7 +867,7 @@
"sanitizer": {
"label": "Sanitizers",
"condition": "features.sanitize_address || features.sanitize_thread || features.sanitize_memory || features.sanitize_undefined",
"output": [ "publicConfig" ]
"output": [ "sanitizer", "publicConfig" ]
},
"GNUmake": {
"label": "GNU make",

View File

@ -876,6 +876,19 @@ defineTest(qtConfOutput_shared) {
export(CONFIG)
}
defineTest(qtConfOutput_sanitizer) {
!$${2}: return()
# Export this here, so that WebEngine can access it at configure time.
CONFIG += sanitizer
$$qtConfEvaluate("features.sanitize_address"): CONFIG += sanitize_address
$$qtConfEvaluate("features.sanitize_thread"): CONFIG += sanitize_thread
$$qtConfEvaluate("features.sanitize_memory"): CONFIG += sanitize_memory
$$qtConfEvaluate("features.sanitize_undefined"): CONFIG += sanitize_undefined
export(CONFIG)
}
defineTest(qtConfOutput_architecture) {
arch = $$qtConfEvaluate("tests.architecture.arch")
buildabi = $$qtConfEvaluate("tests.architecture.buildabi")