This is an archive of the discontinued LLVM Phabricator instance.

Differential D69692

[libcxx][cmake]Fixing ordering in setting SUPPORTS_DIALECT_NAME/SUPPORTS_DIALECT_NAME_MSVC.
AbandonedPublic

Authored by plotfi on Oct 31 2019, 4:50 PM.

Details

Reviewers
beanz
compnerd
EricWF
mclow.lists
Summary

I think the current ordering clobbers LIBCXX_STANDARD_VER and makes it so SUPPORTS_DIALECT_NAME_MSVC and SUPPORTS_DIALECT_NAME are both false.

Diff Detail

Event Timeline

plotfi created this revision.Oct 31 2019, 4:50 PM
Herald added a reviewer: EricWF. · View Herald TranscriptOct 31 2019, 4:50 PM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: libcxx-commits, ldionne, christof, mgorny. · View Herald Transcript
plotfi abandoned this revision.Oct 31 2019, 4:53 PM
Herald added a reviewer: mclow.lists. · View Herald TranscriptOct 31 2019, 4:53 PM

Revision Contents

PathSize
libcxx/
2 lines

Diff 227376

libcxx/CMakeLists.txt

Show First 20 Lines • Show All 520 Lines • ▼ Show 20 Linesfunction(cxx_add_basic_build_flags target)
if (LIBCXX_HAS_MUSL_LIBC OR LIBCXX_TARGETING_CLANG_CL) if (LIBCXX_HAS_MUSL_LIBC OR LIBCXX_TARGETING_CLANG_CL)
# musl's pthread implementations uses volatile types in their structs which is # musl's pthread implementations uses volatile types in their structs which is
# not a constexpr in C++11 but is in C++14, so we use C++14 with musl. # not a constexpr in C++11 but is in C++14, so we use C++14 with musl.
set(LIBCXX_STANDARD_VER c++14 CACHE STRING "internal option to change build dialect") set(LIBCXX_STANDARD_VER c++14 CACHE STRING "internal option to change build dialect")
else() else()
set(LIBCXX_STANDARD_VER c++11 CACHE STRING "internal option to change build dialect") set(LIBCXX_STANDARD_VER c++11 CACHE STRING "internal option to change build dialect")
endif() endif()
target_add_compile_flags_if_supported(${target} PRIVATE -std=${LIBCXX_STANDARD_VER}) target_add_compile_flags_if_supported(${target} PRIVATE -std=${LIBCXX_STANDARD_VER})
target_add_compile_flags_if_supported(${target} PRIVATE "/std:${LIBCXX_STANDARD_VER}")
mangle_name("LIBCXX_SUPPORTS_STD_EQ_${LIBCXX_STANDARD_VER}_FLAG" SUPPORTS_DIALECT_NAME) mangle_name("LIBCXX_SUPPORTS_STD_EQ_${LIBCXX_STANDARD_VER}_FLAG" SUPPORTS_DIALECT_NAME)
target_add_compile_flags_if_supported(${target} PRIVATE "/std:${LIBCXX_STANDARD_VER}")
mangle_name("LIBCXX_SUPPORTS_STD_COLON_${LIBCXX_STANDARD_VER}_FLAG" SUPPORTS_DIALECT_NAME_MSVC) mangle_name("LIBCXX_SUPPORTS_STD_COLON_${LIBCXX_STANDARD_VER}_FLAG" SUPPORTS_DIALECT_NAME_MSVC)
if(NOT ${SUPPORTS_DIALECT_NAME} AND NOT ${SUPPORTS_DIALECT_NAME_MSVC}) if(NOT ${SUPPORTS_DIALECT_NAME} AND NOT ${SUPPORTS_DIALECT_NAME_MSVC})
if(NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC" AND NOT "${CMAKE_CXX_SIMULATE_ID}" STREQUAL "MSVC") if(NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC" AND NOT "${CMAKE_CXX_SIMULATE_ID}" STREQUAL "MSVC")
message(FATAL_ERROR "C++11 or greater is required but the compiler does not support ${LIBCXX_STANDARD_VER}") message(FATAL_ERROR "C++11 or greater is required but the compiler does not support ${LIBCXX_STANDARD_VER}")
endif() endif()
endif() endif()
# On all systems the system c++ standard library headers need to be excluded. # On all systems the system c++ standard library headers need to be excluded.
▲ Show 20 Lines • Show All 409 Lines • Show Last 20 Lines