File tree Expand file tree Collapse file tree 5 files changed +3
-18
lines changed
Expand file tree Collapse file tree 5 files changed +3
-18
lines changed Original file line number Diff line number Diff line change @@ -35,7 +35,3 @@ set(CMAKE_CXX_COMPILER_WORKS ON CACHE BOOL "")
3535# them.
3636set (LIBCXX_TEST_CONFIG "llvm-libc++-android-ndk.cfg.in" CACHE STRING "" )
3737set (LIBCXXABI_TEST_CONFIG "llvm-libc++abi-android-ndk.cfg.in" CACHE STRING "" )
38-
39- # CMAKE_SOURCE_DIR refers to the "<monorepo>/runtimes" directory.
40- set (LIBCXX_EXECUTOR "${CMAKE_SOURCE_DIR} /../libcxx/utils/adb_run.py" CACHE STRING "" )
41- set (LIBCXXABI_EXECUTOR "${LIBCXX_EXECUTOR} " CACHE STRING "" )
Original file line number Diff line number Diff line change @@ -51,8 +51,6 @@ Improvements and New Features
5151Deprecations and Removals
5252-------------------------
5353
54- - TODO: The ``LIBCXX_EXECUTOR `` CMake variables have been removed.
55-
5654- TODO: The ``LIBCXX_ENABLE_ASSERTIONS `` CMake variable that was used to enable the safe mode has been deprecated and setting
5755 it triggers an error; use the ``LIBCXX_HARDENING_MODE `` CMake variable with the value ``extensive `` instead. Similarly,
5856 the ``_LIBCPP_ENABLE_ASSERTIONS `` macro has been deprecated (setting it to ``1 `` still enables the extensive mode in
9896Build System Changes
9997--------------------
10098
101- TODO
99+ - The ``LIBCXX_EXECUTOR `` and ``LIBCXXABI_EXECUTOR `` CMake variables have been removed. Please
100+ set ``LIBCXX_TEST_PARAMS `` to ``executor=<...> `` instead.
Original file line number Diff line number Diff line change @@ -10,11 +10,6 @@ endif()
1010set (AUTO_GEN_COMMENT "## Autogenerated by libcxx configuration.\n # Do not edit!" )
1111set (SERIALIZED_LIT_PARAMS "# Lit parameters serialized here for llvm-lit to pick them up\n " )
1212
13- if (LIBCXX_EXECUTOR)
14- message (DEPRECATION "LIBCXX_EXECUTOR is deprecated, please add executor=... to LIBCXX_TEST_PARAMS" )
15- serialize_lit_string_param(SERIALIZED_LIT_PARAMS executor "${LIBCXX_EXECUTOR} " )
16- endif ()
17-
1813if (NOT LIBCXX_ENABLE_EXCEPTIONS)
1914 serialize_lit_param(SERIALIZED_LIT_PARAMS enable_exceptions False )
2015endif ()
Original file line number Diff line number Diff line change @@ -758,7 +758,7 @@ android-ndk-*)
758758 # level. When tests are run against a device with a newer API level, test
759759 # programs can be built for any supported API level, but building for the
760760 # newest API (i.e. the system image's API) is probably the most interesting.
761- PARAMS=" target_triple=$( triple_of_arch ${ARCH} ) $( api_of_emu_img ${ANDROID_EMU_IMG} ) "
761+ PARAMS=" executor= ${MONOREPO_ROOT} /libcxx/utils/adb_run.py; target_triple=$( triple_of_arch ${ARCH} ) $( api_of_emu_img ${ANDROID_EMU_IMG} ) "
762762 generate-cmake-android -C " ${MONOREPO_ROOT} /runtimes/cmake/android/Arch-${ARCH} .cmake" \
763763 -C " ${MONOREPO_ROOT} /libcxx/cmake/caches/AndroidNDK.cmake" \
764764 -DCMAKE_SYSROOT=/opt/android/ndk/sysroot \
Original file line number Diff line number Diff line change @@ -24,11 +24,6 @@ endif()
2424set (AUTO_GEN_COMMENT "## Autogenerated by libcxxabi configuration.\n # Do not edit!" )
2525set (SERIALIZED_LIT_PARAMS "# Lit parameters serialized here for llvm-lit to pick them up\n " )
2626
27- if (LIBCXXABI_EXECUTOR)
28- message (DEPRECATION "LIBCXXABI_EXECUTOR is deprecated, please add executor=... to LIBCXXABI_TEST_PARAMS" )
29- serialize_lit_string_param(SERIALIZED_LIT_PARAMS executor "${LIBCXXABI_EXECUTOR} " )
30- endif ()
31-
3227if (NOT LIBCXXABI_ENABLE_EXCEPTIONS)
3328 serialize_lit_param(SERIALIZED_LIT_PARAMS enable_exceptions False )
3429endif ()
You can’t perform that action at this time.
0 commit comments