commit 2549fc97c83ddd988254d805123350883d638ab7
author Louis Dionne <ldionne.2@gmail.com> Mon Jul 05 12:27:14 2021 -0400
committer Copybara-Service <copybara-worker@google.com> Thu Jul 15 15:05:52 2021 -0700
tree 177d3a4c0d6b4c9b966725600f2440fcf4ec56c1
parent 7f7eaf9ff475afe11b69f896b72dd14458d01786

[runtimes] Move enable_32bit to the DSL

This is necessary for from-scratch configurations to support the 32-bit
mode of the test suite.

Differential Revision: https://reviews.llvm.org/D105435

GitOrigin-RevId: f7d8754312bf3d10fb902d94f2bc84e3adf12ba4

test/CMakeLists.txt

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index b571a24..385c43e 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -90,6 +90,10 @@
   serialize_lit_param(target_triple "\"${TARGET_TRIPLE}\"")
 endif()
 
+if (LIBCXXABI_BUILD_32_BITS)
+  serialize_lit_param(enable_32bit True)
+endif()
+
 configure_lit_site_cfg(
   "${LIBCXXABI_TEST_CONFIG}"
   ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg

test/lit.site.cfg.in

diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in
index 4015501..049f822 100644
--- a/test/lit.site.cfg.in
+++ b/test/lit.site.cfg.in
@@ -18,7 +18,6 @@
 config.llvm_unwinder            = @LIBCXXABI_USE_LLVM_UNWINDER@
 config.builtins_library         = "@LIBCXXABI_BUILTINS_LIBRARY@"
 config.enable_threads           = @LIBCXXABI_ENABLE_THREADS@
-config.enable_32bit             = @LIBCXXABI_BUILD_32_BITS@
 config.target_info              = "@LIBCXXABI_TARGET_INFO@"
 config.executor                 = "@LIBCXXABI_EXECUTOR@"
 config.libcxxabi_shared         = @LIBCXXABI_LINK_TESTS_WITH_SHARED_LIBCXXABI@