This is an archive of the discontinued LLVM Phabricator instance.

Differential D126760

[flang] Make sure that `flang` is also installed
ClosedPublic

Authored by awarzynski on Jun 1 2022, 1:48 AM.

Details

Reviewers
DavidSpickett
sscalpone
Commits
rGc7c76ecd1a53: [flang] Make sure that `flang` is also installed
Summary

This patch makes sure that flang (symlink to flang-to-external-fc)
is installed alongside other Flang tools. Fixes build failures in
clang-aarch64-full-2stage [1] introduced after merging
https://reviews.llvm.org/D125832.

[1] https://lab.llvm.org/buildbot/#/builders/179/builds/3799

Diff Detail

Event Timeline

awarzynski created this revision.Jun 1 2022, 1:48 AM
Herald added a reviewer: sscalpone. · View Herald TranscriptJun 1 2022, 1:48 AM
Herald added projects: Restricted Project, Restricted Project. · View Herald Transcript
Herald added subscribers: kristof.beyls, mgorny. · View Herald Transcript
awarzynski requested review of this revision.Jun 1 2022, 1:48 AM
Herald added a subscriber: jdoerfert. · View Herald TranscriptJun 1 2022, 1:48 AM
DavidSpickett accepted this revision.Jun 1 2022, 1:49 AM

LGTM

This revision is now accepted and ready to land.Jun 1 2022, 1:49 AM
This revision was landed with ongoing or failed builds.Jun 1 2022, 1:54 AM
Closed by commit rGc7c76ecd1a53: [flang] Make sure that `flang` is also installed (authored by awarzynski). · Explain Why
This revision was automatically updated to reflect the committed changes.
awarzynski added a commit: rGc7c76ecd1a53: [flang] Make sure that `flang` is also installed.
Harbormaster completed remote builds in B167208: Diff 433321.Jun 1 2022, 2:04 AM

Revision Contents

PathSize
flang/
tools/
f18/
1 line

Diff 433322

flang/tools/f18/CMakeLists.txt

Show First 20 Lines • Show All 52 Lines • ▼ Show 20 Linesif (NOT WIN32)
add_custom_command( add_custom_command(
OUTPUT ${CMAKE_BINARY_DIR}/bin/flang-to-external-fc OUTPUT ${CMAKE_BINARY_DIR}/bin/flang-to-external-fc
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/flang-to-external-fc DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/flang-to-external-fc
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/flang-to-external-fc ${CMAKE_BINARY_DIR}/bin) COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/flang-to-external-fc ${CMAKE_BINARY_DIR}/bin)
add_custom_target(flang-to-external-fc ALL DEPENDS ${CMAKE_BINARY_DIR}/bin/flang-to-external-fc) add_custom_target(flang-to-external-fc ALL DEPENDS ${CMAKE_BINARY_DIR}/bin/flang-to-external-fc)
install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang-to-external-fc DESTINATION "${CMAKE_INSTALL_BINDIR}") install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang-to-external-fc DESTINATION "${CMAKE_INSTALL_BINDIR}")
add_custom_target(flang-slink ALL DEPENDS ${CMAKE_BINARY_DIR}/bin/flang-to-external-fc COMMAND ${CMAKE_COMMAND} -E create_symlink add_custom_target(flang-slink ALL DEPENDS ${CMAKE_BINARY_DIR}/bin/flang-to-external-fc COMMAND ${CMAKE_COMMAND} -E create_symlink
${CMAKE_BINARY_DIR}/bin/flang-to-external-fc ${CMAKE_BINARY_DIR}/bin/flang) ${CMAKE_BINARY_DIR}/bin/flang-to-external-fc ${CMAKE_BINARY_DIR}/bin/flang)
install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang DESTINATION "${CMAKE_INSTALL_BINDIR}")
endif() endif()
# TODO Move this to a more suitable location # TODO Move this to a more suitable location
file(COPY ${FLANG_SOURCE_DIR}/module/omp_lib.h DESTINATION "${CMAKE_BINARY_DIR}/include/flang/OpenMP/" FILE_PERMISSIONS OWNER_READ OWNER_WRITE) file(COPY ${FLANG_SOURCE_DIR}/module/omp_lib.h DESTINATION "${CMAKE_BINARY_DIR}/include/flang/OpenMP/" FILE_PERMISSIONS OWNER_READ OWNER_WRITE)