From d1e02c385539ce971fbad207ba9aaa32be9c7bac Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Wed, 9 Mar 2022 16:40:25 +0100 Subject: [PATCH] Add '-stdlib=libc++' only for c++ compilers Pick-to: 6.2 6.3 Task-number: QTBUG-101602 Change-Id: I4ecbb73f845d94156189acfd1a3074b676c90fc4 Reviewed-by: Qt CI Bot Reviewed-by: Alexandru Croitor Reviewed-by: Marc Mutz --- cmake/QtPlatformTargetHelpers.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cmake/QtPlatformTargetHelpers.cmake b/cmake/QtPlatformTargetHelpers.cmake index 270ed3167b9..4d5ad793742 100644 --- a/cmake/QtPlatformTargetHelpers.cmake +++ b/cmake/QtPlatformTargetHelpers.cmake @@ -27,8 +27,12 @@ function(qt_internal_setup_public_platform_target) endif() if (QT_FEATURE_stdlib_libcpp) - target_compile_options(Platform INTERFACE "-stdlib=libc++") - target_link_options(Platform INTERFACE "-stdlib=libc++") + target_compile_options(Platform INTERFACE "$<$:-stdlib=libc++>") + set(libc_link_option "-stdlib=libc++") + if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.18") + set(libc_link_option "$<$:-stdlib=libc++>") + endif() + target_link_options(Platform INTERFACE "${libc_link_option}") endif() if (QT_FEATURE_no_extern_direct_access) target_compile_options(Platform INTERFACE "-mno-direct-extern-access")