diff options
author | Louis Dionne <ldionne.2@gmail.com> | 2024-02-26 14:46:15 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-26 14:46:15 -0500 |
commit | 5e6f50eaa9510366352dde60b48bf7c3169762ea (patch) | |
tree | 5e748fd36c9ccc59024a9bf1b250b267c4f1219a /libcxx | |
parent | deaf53e632f37be1e4f7a57959c35fcae161b141 (diff) | |
download | llvm-5e6f50eaa9510366352dde60b48bf7c3169762ea.zip llvm-5e6f50eaa9510366352dde60b48bf7c3169762ea.tar.gz llvm-5e6f50eaa9510366352dde60b48bf7c3169762ea.tar.bz2 |
[libc++] Remove LIBCXX_EXECUTOR and LIBCXXABI_EXECUTOR (#79886)
Those were deprecated in LLVM 18 and their removal was planned for LLVM 19.
Diffstat (limited to 'libcxx')
-rw-r--r-- | libcxx/cmake/caches/AndroidNDK.cmake | 4 | ||||
-rw-r--r-- | libcxx/docs/ReleaseNotes/19.rst | 5 | ||||
-rw-r--r-- | libcxx/test/CMakeLists.txt | 5 | ||||
-rwxr-xr-x | libcxx/utils/ci/run-buildbot | 2 |
4 files changed, 3 insertions, 13 deletions
diff --git a/libcxx/cmake/caches/AndroidNDK.cmake b/libcxx/cmake/caches/AndroidNDK.cmake index 23fbc3f..2985187 100644 --- a/libcxx/cmake/caches/AndroidNDK.cmake +++ b/libcxx/cmake/caches/AndroidNDK.cmake @@ -35,7 +35,3 @@ set(CMAKE_CXX_COMPILER_WORKS ON CACHE BOOL "") # them. set(LIBCXX_TEST_CONFIG "llvm-libc++-android-ndk.cfg.in" CACHE STRING "") set(LIBCXXABI_TEST_CONFIG "llvm-libc++abi-android-ndk.cfg.in" CACHE STRING "") - -# CMAKE_SOURCE_DIR refers to the "<monorepo>/runtimes" directory. -set(LIBCXX_EXECUTOR "${CMAKE_SOURCE_DIR}/../libcxx/utils/adb_run.py" CACHE STRING "") -set(LIBCXXABI_EXECUTOR "${LIBCXX_EXECUTOR}" CACHE STRING "") diff --git a/libcxx/docs/ReleaseNotes/19.rst b/libcxx/docs/ReleaseNotes/19.rst index a7f108c..6c8f8d1 100644 --- a/libcxx/docs/ReleaseNotes/19.rst +++ b/libcxx/docs/ReleaseNotes/19.rst @@ -51,8 +51,6 @@ Improvements and New Features Deprecations and Removals ------------------------- -- TODO: The ``LIBCXX_EXECUTOR`` CMake variables have been removed. - - TODO: The ``LIBCXX_ENABLE_ASSERTIONS`` CMake variable that was used to enable the safe mode has been deprecated and setting it triggers an error; use the ``LIBCXX_HARDENING_MODE`` CMake variable with the value ``extensive`` instead. Similarly, the ``_LIBCPP_ENABLE_ASSERTIONS`` macro has been deprecated (setting it to ``1`` still enables the extensive mode in @@ -98,4 +96,5 @@ TODO Build System Changes -------------------- -TODO +- The ``LIBCXX_EXECUTOR`` and ``LIBCXXABI_EXECUTOR`` CMake variables have been removed. Please + set ``LIBCXX_TEST_PARAMS`` to ``executor=<...>`` instead. diff --git a/libcxx/test/CMakeLists.txt b/libcxx/test/CMakeLists.txt index 52620fc..e0d3a0d 100644 --- a/libcxx/test/CMakeLists.txt +++ b/libcxx/test/CMakeLists.txt @@ -10,11 +10,6 @@ endif() set(AUTO_GEN_COMMENT "## Autogenerated by libcxx configuration.\n# Do not edit!") set(SERIALIZED_LIT_PARAMS "# Lit parameters serialized here for llvm-lit to pick them up\n") -if (LIBCXX_EXECUTOR) - message(DEPRECATION "LIBCXX_EXECUTOR is deprecated, please add executor=... to LIBCXX_TEST_PARAMS") - serialize_lit_string_param(SERIALIZED_LIT_PARAMS executor "${LIBCXX_EXECUTOR}") -endif() - if (NOT LIBCXX_ENABLE_EXCEPTIONS) serialize_lit_param(SERIALIZED_LIT_PARAMS enable_exceptions False) endif() diff --git a/libcxx/utils/ci/run-buildbot b/libcxx/utils/ci/run-buildbot index ddfe53d..2905745 100755 --- a/libcxx/utils/ci/run-buildbot +++ b/libcxx/utils/ci/run-buildbot @@ -758,7 +758,7 @@ android-ndk-*) # level. When tests are run against a device with a newer API level, test # programs can be built for any supported API level, but building for the # newest API (i.e. the system image's API) is probably the most interesting. - PARAMS="target_triple=$(triple_of_arch ${ARCH})$(api_of_emu_img ${ANDROID_EMU_IMG})" + PARAMS="executor=${MONOREPO_ROOT}/libcxx/utils/adb_run.py;target_triple=$(triple_of_arch ${ARCH})$(api_of_emu_img ${ANDROID_EMU_IMG})" generate-cmake-android -C "${MONOREPO_ROOT}/runtimes/cmake/android/Arch-${ARCH}.cmake" \ -C "${MONOREPO_ROOT}/libcxx/cmake/caches/AndroidNDK.cmake" \ -DCMAKE_SYSROOT=/opt/android/ndk/sysroot \ |