File tree Expand file tree Collapse file tree 2 files changed +10
-27
lines changed Expand file tree Collapse file tree 2 files changed +10
-27
lines changed Original file line number Diff line number Diff line change @@ -179,7 +179,7 @@ function(create_libc_unittest fq_target_name)
179
179
)
180
180
181
181
# LibcUnitTest should not depend on anything in LINK_LIBRARIES.
182
- list (APPEND link_libraries LibcUnitTestMain LibcUnitTest )
182
+ list (APPEND link_libraries LibcUnitTest )
183
183
184
184
target_link_libraries (${fq_build_target_name} PRIVATE ${link_libraries} )
185
185
@@ -669,7 +669,7 @@ function(add_libc_hermetic_test test_name)
669
669
PRIVATE
670
670
${HERMETIC_TEST_LINK_LIBRARIES}
671
671
libc.startup.${LIBC_TARGET_OS}.crt1
672
- LibcHermeticTestMain LibcHermeticTest
672
+ LibcHermeticTest
673
673
# The NVIDIA 'nvlink' linker does not currently support static libraries.
674
674
$< $< NOT:$< BOOL:${LIBC_GPU_TARGET_ARCHITECTURE_IS_NVPTX} > > :${fq_target_name} .__libc__> )
675
675
add_dependencies (${fq_build_target_name}
Original file line number Diff line number Diff line change 1
1
set (libc_test_srcs_common
2
- Test .h
3
- LibcTest.cpp
4
2
CmakeFilePath.cpp
5
- LibcTest.h
3
+ LibcTest.cpp
4
+ LibcTestMain.cpp
6
5
TestLogger.cpp
6
+ LibcTest.h
7
+ Test .h
7
8
TestLogger.h
8
9
)
9
10
@@ -36,23 +37,7 @@ add_library(
36
37
HermeticTestUtils.cpp
37
38
)
38
39
39
- add_library (
40
- LibcUnitTestMain
41
- ${library_type}
42
- EXCLUDE_FROM_ALL
43
- LibcTestMain.cpp
44
- )
45
- add_dependencies (LibcUnitTestMain LibcUnitTest )
46
-
47
- add_library (
48
- LibcHermeticTestMain
49
- ${library_type}
50
- EXCLUDE_FROM_ALL
51
- LibcTestMain.cpp
52
- )
53
- add_dependencies (LibcHermeticTestMain LibcHermeticTest )
54
-
55
- foreach (lib LibcUnitTest LibcUnitTestMain LibcHermeticTest LibcHermeticTestMain )
40
+ foreach (lib LibcUnitTest LibcHermeticTest )
56
41
target_include_directories (${lib} PUBLIC ${LIBC_SOURCE_DIR} )
57
42
target_compile_options (${lib} PRIVATE -fno-exceptions -fno-rtti )
58
43
add_dependencies (${lib}
@@ -65,11 +50,9 @@ foreach(lib LibcUnitTest LibcUnitTestMain LibcHermeticTest LibcHermeticTestMain)
65
50
)
66
51
endforeach ()
67
52
68
- foreach (lib LibcHermeticTest LibcHermeticTestMain )
69
- target_include_directories (${lib} PRIVATE ${LIBC_BUILD_DIR} /include )
70
- target_compile_options (${lib}
71
- PRIVATE ${LIBC_HERMETIC_TEST_COMPILE_OPTIONS} -ffreestanding -nostdlib -nostdlib++ )
72
- endforeach ()
53
+ target_include_directories (LibcHermeticTest PRIVATE ${LIBC_BUILD_DIR} /include )
54
+ target_compile_options (LibcHermeticTest
55
+ PRIVATE ${LIBC_HERMETIC_TEST_COMPILE_OPTIONS} -ffreestanding -nostdlib -nostdlib++ )
73
56
74
57
add_header_library (
75
58
string_utils
You can’t perform that action at this time.
0 commit comments