Skip to content

Commit 4f30a6e

Browse files
committed
[rebase] remove last FLANG_BUILD_NEW_DRIVER option usage and use flang-new to build modules (like upstream)
1 parent 9cbe9bd commit 4f30a6e

File tree

3 files changed

+8
-15
lines changed

3 files changed

+8
-15
lines changed

flang/lib/CMakeLists.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@ add_subdirectory(Evaluate)
99
add_subdirectory(Decimal)
1010
add_subdirectory(Lower)
1111
add_subdirectory(Parser)
12-
add_subdirectory(Optimizer)
1312
add_subdirectory(Semantics)
13+
add_subdirectory(Frontend)
14+
add_subdirectory(FrontendTool)
1415

15-
if(FLANG_BUILD_NEW_DRIVER)
16-
add_subdirectory(Frontend)
17-
add_subdirectory(FrontendTool)
18-
endif()
16+
add_subdirectory(Optimizer)

flang/test/CMakeLists.txt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,13 @@ configure_lit_site_cfg(
2727
PATHS
2828
${PATHS_FOR_PLUGINS}
2929
)
30+
3031
configure_lit_site_cfg(
3132
${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.py.in
3233
${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg.py
3334
MAIN_CONFIG
3435
${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.cfg.py
35-
)
36+
)
3637

3738
configure_lit_site_cfg(
3839
${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.py.in
@@ -45,17 +46,13 @@ set(FLANG_TEST_PARAMS
4546
flang_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py)
4647

4748
set(FLANG_TEST_DEPENDS
48-
f18 FileCheck count not module_files
49+
flang-new FileCheck count not module_files
4950
opt llc
5051
tco bbc
5152
fir-opt
5253
FortranRuntime FortranDecimal Fortran_main
5354
)
5455

55-
if (FLANG_BUILD_NEW_DRIVER)
56-
list(APPEND FLANG_TEST_DEPENDS flang-new)
57-
endif()
58-
5956
if (FLANG_INCLUDE_TESTS)
6057
if (FLANG_GTEST_AVAIL)
6158
list(APPEND FLANG_TEST_DEPENDS FlangUnitTests)

flang/tools/CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@
77
#===------------------------------------------------------------------------===#
88

99
add_subdirectory(f18)
10+
add_subdirectory(flang-driver)
11+
add_subdirectory(tco)
1012
add_subdirectory(f18-parse-demo)
1113
add_subdirectory(fir-opt)
1214
add_subdirectory(bbc)
13-
add_subdirectory(tco)
14-
if(FLANG_BUILD_NEW_DRIVER)
15-
add_subdirectory(flang-driver)
16-
endif()

0 commit comments

Comments
 (0)