From bbebfa0be2e51b638459d6d812e4db25a65a0d6d Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Mon, 21 Dec 2020 19:29:30 +0100 Subject: CMake: Add --enable-new-dtags flag support Remove enable-new-dtags from feature mapping, handle it as regular feature. Regenerate configure.cmake with 'enable-new-dtags' enabled. Check for enable_new_dtags feature, add -Wl,--enable-new-dtags if enabled. Fixes: QTBUG-89013 Pick-to: 6.0 Change-Id: Ice57c02dc85f7f9ecf14e3bc65f31a57b589ce24 Reviewed-by: Joerg Bornemann Reviewed-by: Craig Scott --- .prev_configure.cmake | 5 +++++ 1 file changed, 5 insertions(+) (limited to '.prev_configure.cmake') diff --git a/.prev_configure.cmake b/.prev_configure.cmake index 63a9404708..75081a87c9 100644 --- a/.prev_configure.cmake +++ b/.prev_configure.cmake @@ -635,6 +635,11 @@ qt_feature("ltcg" CONDITION __qt_ltcg_detected ) qt_feature_config("ltcg" QMAKE_PRIVATE_CONFIG) +qt_feature("enable_new_dtags" + LABEL "Using new DTAGS" + CONDITION LINUX AND TEST_enable_new_dtags +) +qt_feature_config("enable_new_dtags" QMAKE_PRIVATE_CONFIG) qt_feature("enable_gdb_index" LABEL "Generating GDB index" AUTODETECT QT_FEATURE_developer_build -- cgit v1.2.3