Skip to content

Commit

Permalink
[flang] Change README to refer to LLVM_BUILD_DIR. (flang-compiler/f18…
Browse files Browse the repository at this point in the history
…#1033)

* Change README to refer to LLVM_BUILD_DIR.

LLVM_INSTALL_TOOLS doesn't to install llvm-lit. However pointing to the cmake file in the build directory works fine, and lit and FileCheck will be picked up correctly this way.

Original-commit: flang-compiler/f18@3cbe344
Reviewed-on: flang-compiler/f18#1033
  • Loading branch information
sscalpone authored Mar 5, 2020
1 parent 6110630 commit a705a4a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 20 deletions.
17 changes: 3 additions & 14 deletions flang/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,21 +77,10 @@ the variable `LLVM_DIR` to find the installed components.
To get the correct LLVM libraries included in your f18 build,
define LLVM_DIR on the cmake command line.
```
LLVM=<LLVM_INSTALLATION_DIR>/lib/cmake/llvm cmake -DLLVM_DIR=$LLVM ...
LLVM=<LLVM_BUILD_DIR>/lib/cmake/llvm cmake -DLLVM_DIR=$LLVM ...
```
where `LLVM_INSTALLATION_DIR` is
the top-level directory
where llvm is installed.

### LLVM dependency for lit Regression tests

F18 has tests that use the lit framework, these tests rely on the
presence of llvm tools as llvm-lit, FileCheck, and others.
These tools are installed when LLVM build set:
```
LLVM_INSTALL_UTILS=On
```
to run the regression tests on f18.
where `LLVM_BUILD_DIR` is
the top-level directory where LLVM was built.

### Building f18 with GCC

Expand Down
7 changes: 1 addition & 6 deletions flang/test-lit/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,12 @@ set(FLANG_TEST_PARAMS
flang_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py)

set(FLANG_TEST_DEPENDS
flang
f18
llvm-lit
FileCheck
count
not
)
add_lit_testsuite(check-all "Running the Flang regression tests"
${CMAKE_CURRENT_BINARY_DIR}
PARAMS ${FLANG_TEST_PARAMS}
DEPENDS ${FLANG_TEST_DEPENS}
DEPENDS ${FLANG_TEST_DEPENDS}
)
set_target_properties(check-all PROPERTIES FOLDER "Tests")

0 comments on commit a705a4a

Please sign in to comment.