diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2023-02-24 11:30:38 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2023-03-01 10:54:25 +0100 |
| commit | c2804ef60e40e1723d0a45ab9d70413ba2d3b7d0 (patch) | |
| tree | 6f2d2f465f22d08e6668f85c8c0a5ea088e2c5cc | |
| parent | e3f05d9703aa1ecc23b7ddb16e17caf6ff7456ea (diff) | |
| download | qttools-c2804ef60e40e1723d0a45ab9d70413ba2d3b7d0.tar.gz | |
Disable -fPIE for tools that depend on 3rdparty libs
If the 3rdparty libs are not built with -fPIE enabled we cannot link it
to the tools. Disable the flag until provisioning got the proper
update.
Change-Id: I25aa3dcec480219e3d29225ee517d9a910a1966e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 6deec055f952070caf19e537b223eb1dbeb509a1)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| -rw-r--r-- | src/linguist/lupdate/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/qdoc/CMakeLists.txt | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/linguist/lupdate/CMakeLists.txt b/src/linguist/lupdate/CMakeLists.txt index 9a51ede95..ae4962dce 100644 --- a/src/linguist/lupdate/CMakeLists.txt +++ b/src/linguist/lupdate/CMakeLists.txt @@ -99,6 +99,12 @@ qt_internal_extend_target(${target_name} CONDITION QT_FEATURE_clangcpp WrapLibClang::WrapLibClang # special case ) +if(QT_FEATURE_clangcpp) + # If libclangTooling.a is not built with -fPIE enabled we cannot link it to lupdate. + # TODO: Re-enable PIE once clang is built with PIE in provisioning. + set_target_properties(${target_name} PROPERTIES POSITION_INDEPENDENT_CODE FALSE) +endif() + qt_internal_extend_target(${target_name} CONDITION MSVC DEFINES _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING) diff --git a/src/qdoc/CMakeLists.txt b/src/qdoc/CMakeLists.txt index ab6678f6c..c6a076691 100644 --- a/src/qdoc/CMakeLists.txt +++ b/src/qdoc/CMakeLists.txt @@ -109,6 +109,10 @@ qt_internal_return_unless_building_tools() #### Keys ignored in scope 2:.:.:qdoc.pro:NOT force_bootstrap: # _REQUIREMENTS = "qtConfig(xmlstreamwriter)" +# If libclangTooling.a is not built with -fPIE enabled we cannot link it to qdoc. +# TODO: Re-enable PIE once clang is built with PIE in provisioning. +set_target_properties(${target_name} PROPERTIES POSITION_INDEPENDENT_CODE FALSE) + qt_internal_extend_target(${target_name} CONDITION TARGET Qt::QmlPrivate LIBRARIES Qt::QmlPrivate |