Skip to content

Commit 5859bc8

Browse files
committed
Temporarily fix full build.
1 parent c769f57 commit 5859bc8

File tree

3 files changed

+17
-7
lines changed

3 files changed

+17
-7
lines changed

libc/cmake/modules/LLVMLibCCheckMPFR.cmake

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ else()
1111
LIBC_TESTS_CAN_USE_MPFR
1212
${CMAKE_CURRENT_BINARY_DIR}
1313
SOURCES
14-
${LIBC_SOURCE_DIR}/utils/MPFRWrapper/check_mpfr.cpp
15-
COMPILE_DEFINITIONS ${LIBC_COMPILE_OPTIONS_DEFAULT}
14+
${LIBC_SOURCE_DIR}/utils/MPFRWrapper/check_mpfr.cpp
15+
COMPILE_DEFINITIONS
16+
${LIBC_COMPILE_OPTIONS_DEFAULT}
1617
LINK_LIBRARIES
1718
-lmpfr -lgmp -latomic
1819
)

libc/test/UnitTest/CMakeLists.txt

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,26 @@ function(add_unittest_framework_library name)
1919
${TEST_LIB_SRCS}
2020
${TEST_LIB_HDRS}
2121
)
22-
target_include_directories(${lib} PUBLIC ${LIBC_SOURCE_DIR})
22+
target_include_directories(${lib} PRIVATE ${LIBC_SOURCE_DIR})
2323
if(TARGET libc.src.time.clock)
2424
target_compile_definitions(${lib} PRIVATE TARGET_SUPPORTS_CLOCK)
2525
endif()
2626
endforeach()
2727

28-
_get_common_test_compile_options(compile_options "" "")
29-
target_compile_options(${name}.unit PRIVATE ${compile_options})
28+
if(LLVM_LIBC_FULL_BUILD)
29+
# TODO: Build test framework with LIBC_FULL_BUILD in full build mode after
30+
# making LibcFPExceptionHelpers and LibcDeathTestExecutors hermetic.
31+
set(LLVM_LIBC_FULL_BUILD "")
32+
_get_common_test_compile_options(compile_options "" "")
33+
target_compile_options(${name}.unit PRIVATE ${compile_options})
34+
set(LLVM_LIBC_FULL_BUILD ON)
35+
else()
36+
_get_common_test_compile_options(compile_options "" "")
37+
target_compile_options(${name}.unit PRIVATE ${compile_options})
38+
endif()
3039

3140
_get_hermetic_test_compile_options(compile_options "")
32-
target_include_directories(${name}.hermetic PRIVATE ${LIBC_BUILD_DIR}/include)
41+
target_include_directories(${name}.hermetic PRIVATE ${LIBC_INCLUDE_DIR})
3342
target_compile_options(${name}.hermetic PRIVATE ${compile_options} -nostdinc++)
3443

3544
if(TEST_LIB_DEPENDS)

libc/test/integration/startup/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ function(add_startup_test target_name)
3232
PRIVATE
3333
${LIBC_SOURCE_DIR}
3434
${LIBC_BUILD_DIR}
35-
${LIBC_BUILD_DIR}/include
35+
${LIBC_INCLUDE_DIR}
3636
)
3737

3838
if(ADD_STARTUP_TEST_DEPENDS)

0 commit comments

Comments
 (0)